From 930d36f4435d63c9e1a40524f5910300d35f6d96 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 14 Apr 2016 00:35:50 +0000
Subject: [PATCH] core/linux-armv7 to 4.5.1-1

---
 core/linux-armv7/PKGBUILD | 15 ++++-----
 core/linux-armv7/config   | 64 +++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 139f017b6..6a6720f0e 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-armv7
 _srcname=linux-4.5
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 rcnrel=armv7-x2
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -16,7 +16,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 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"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@@ -34,7 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
 md5sums=('a60d48eee08ec0536d5efb17ca819aef'
-         'aa07b49abd5726fe81d797b91e476367'
+         '1df9ff0283c1732ebbf7c55f340a121b'
+         '6aface3d993e948052aabd790f67ecc9'
          '2382c661e820edbf4cba5a39e19d0bd5'
          'b38e6003768a6cf9d46f1a5f9e47925c'
          '99a159bd9b2ea2dcfd338b29a8551043'
@@ -45,9 +46,9 @@ md5sums=('a60d48eee08ec0536d5efb17ca819aef'
          'ef109fafa606732d8993a3fdb538c3df'
          'a9b7d60e76b8d8b426c27d15c5b21466'
          '3a6fd8d0de5d8e396c2a7d68873cd627'
-         'e60e34600957fb7c9d837511eeb4f641'
+         '5b6793e571ebb08457df5a270c2fd31f'
          '1813b39074d01af6548951764a0f6444'
-         'cb2cdd34d6ea18a1411045413d8d18ef'
+         '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8')
 
@@ -55,7 +56,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #git apply --whitespace=nowarn ../patch-${pkgver}
+  git apply --whitespace=nowarn ../patch-${pkgver}
 
   # RCN patch
   git apply ../patch-${pkgver%.0}-${rcnrel}.diff
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index b6159aeac..9eff0bfd8 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.5.0-rc7-2 Kernel Configuration
+# Linux/arm 4.5.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3323,10 +3323,10 @@ 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 is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
+CONFIG_SERIAL_8250_OMAP=y
+CONFIG_SERIAL_8250_OMAP_TTYO_FIXUP=y
 # CONFIG_SERIAL_8250_MID is not set
+# CONFIG_SERIAL_8250_MOXA is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 
 #
@@ -3354,8 +3354,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_JSM is not set
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
+# CONFIG_SERIAL_OMAP is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_BCM63XX is not set
@@ -3372,6 +3371,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=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
@@ -6434,13 +6434,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
 #
@@ -6462,7 +6455,6 @@ CONFIG_AD2S1210=m
 #
 # Triggers - standalone
 #
-# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_FB_SM750 is not set
 # CONFIG_FB_XGI is not set
 
@@ -6537,7 +6529,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
@@ -6795,7 +6789,9 @@ CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
 CONFIG_ROCKCHIP_SARADC=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
@@ -6812,6 +6808,7 @@ CONFIG_AD8366=m
 #
 # Chemical Sensors
 #
+CONFIG_ATLAS_PH_SENSOR=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
 
@@ -6844,6 +6841,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
@@ -6852,6 +6850,7 @@ CONFIG_MAX517=m
 CONFIG_MAX5821=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
+CONFIG_VF610_DAC=m
 
 #
 # IIO dummy driver
@@ -6890,8 +6889,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
 
 #
@@ -6910,6 +6915,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
 
@@ -6954,6 +6961,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
@@ -6964,7 +6974,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Triggers - standalone
 #
-# CONFIG_IIO_HRTIMER_TRIGGER is not set
+CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 
@@ -6972,6 +6982,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 # Digital potentiometers
 #
 CONFIG_MCP4531=m
+CONFIG_TPL0102=m
 
 #
 # Pressure sensors
@@ -6979,6 +6990,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
@@ -7276,6 +7289,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