From 3eda2c53bf255b87d1e36b6e58c9594b4d1d9cc7 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 15 Apr 2016 00:11:17 +0000
Subject: [PATCH] core/linux-am33x to 4.5.1-1

---
 core/linux-am33x/PKGBUILD | 13 ++++-----
 core/linux-am33x/config   | 56 ++++++++++++++++++++++++++++++---------
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index dd3d763f9..35fe4618b 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -7,29 +7,30 @@ pkgbase=linux-am33x
 _srcname=linux-4.5
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
-pkgver=4.5.0
+pkgver=4.5.1
 pkgrel=1
-rcnrel=bone3
+rcnrel=bone4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'dtc-overlay')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
         "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
         "git+https://github.com/RobertCNelson/bb.org-overlays.git"
         'config')
 md5sums=('a60d48eee08ec0536d5efb17ca819aef'
-         'ef2b301cdbaabec6236c9a353917c87e'
+         '1df9ff0283c1732ebbf7c55f340a121b'
+         '21eac9daa59e6019f2c71e35c8522725'
          'SKIP'
-         'c4741f0078dbc772d867d0a12c95ec68')
+         '6c09813791d5248223c2b661beecd18b')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # ALARM patches
   git apply "${srcdir}/patch-${pkgver%.0}-${rcnrel}.diff"
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index 19866ff83..8996c44b7 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-1 Kernel Configuration
+# Linux/arm 4.5.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2569,10 +2569,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 CONFIG_SERIAL_8250_FSL=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_RT288X is not set
 CONFIG_SERIAL_8250_OMAP=y
 CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
-# CONFIG_SERIAL_8250_INGENIC is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
@@ -2599,6 +2597,8 @@ CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
 # CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_SERIAL_STM32 is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
+CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
@@ -4866,13 +4866,6 @@ CONFIG_SENSORS_ISL29028=m
 CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
-
 #
 # Active energy metering IC
 #
@@ -4894,7 +4887,6 @@ CONFIG_AD2S1210=m
 #
 # Triggers - standalone
 #
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 
 #
 # Speakup console speech
@@ -4953,7 +4945,9 @@ CONFIG_FB_TFT_RA8875=m
 CONFIG_FB_TFT_S6D02A1=m
 CONFIG_FB_TFT_S6D1121=m
 CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
 CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1325=m
 CONFIG_FB_TFT_SSD1331=m
 CONFIG_FB_TFT_SSD1351=m
 CONFIG_FB_TFT_ST7735R=m
@@ -5140,7 +5134,9 @@ CONFIG_MCP3422=m
 CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
 CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADS1015=m
 CONFIG_TI_ADS8688=m
 CONFIG_TI_AM335X_ADC=m
 CONFIG_TWL4030_MADC=m
@@ -5156,6 +5152,7 @@ CONFIG_AD8366=m
 #
 # Chemical Sensors
 #
+CONFIG_ATLAS_PH_SENSOR=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
 
@@ -5188,6 +5185,7 @@ CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
 CONFIG_AD5686=m
 CONFIG_AD5755=m
+CONFIG_AD5761=m
 CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD7303=m
@@ -5196,6 +5194,7 @@ CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
+CONFIG_VF610_DAC=m
 
 #
 # IIO dummy driver
@@ -5234,8 +5233,14 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
 CONFIG_ITG3200=m
 
 #
-# Health sensors
+# Health Sensors
 #
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
 CONFIG_MAX30100=m
 
 #
@@ -5254,6 +5259,8 @@ CONFIG_ADIS16400=m
 CONFIG_ADIS16480=m
 CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -5298,6 +5305,9 @@ CONFIG_MMC35240=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
 
 #
 # Inclinometer sensors
@@ -5316,6 +5326,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # Digital potentiometers
 #
 CONFIG_MCP4531=m
+CONFIG_TPL0102=m
 
 #
 # Pressure sensors
@@ -5323,6 +5334,8 @@ CONFIG_MCP4531=m
 CONFIG_BMP280=m
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
 CONFIG_MPL3115=m
 CONFIG_MS5611=m
 CONFIG_MS5611_I2C=m
@@ -5613,6 +5626,25 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+CONFIG_AUFS_HNOTIFY=y
+CONFIG_AUFS_HFSNOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_XATTR=y
+CONFIG_AUFS_FHSM=y
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y