From 7da8c5bfca04c3cb887a88714116e1efd544770d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 8 Mar 2015 00:10:18 +0000
Subject: [PATCH] core/linux-raspberrypi to 3.18.9-1

---
 core/linux-raspberrypi/PKGBUILD   | 14 +++++++-------
 core/linux-raspberrypi/config.txt |  2 ++
 core/linux-raspberrypi/config.v6  | 13 +++++++++++--
 core/linux-raspberrypi/config.v7  | 13 +++++++++++--
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index 6ea24d8c3..84c955582 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -7,12 +7,12 @@
 buildarch=20
 
 pkgbase=linux-raspberrypi
-_commit=56941b1cd8b6766d755a7252ebf7a5c6e17ec000
+_commit=d8a7f3bd38c4741f23d7f28ffdc1d3fdebe34011
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
-pkgver=3.18.8
-pkgrel=4
+pkgver=3.18.9
+pkgrel=1
 bfqver=v7r7
 arch=('armv6h' 'armv7h')
 url="http://www.kernel.org/"
@@ -30,16 +30,16 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'cmdline.txt'
         'config.v6'
         'config.v7')
-md5sums=('ec1c0d70a89be8e5f3f7377f0903acfd'
+md5sums=('92d2290c8a74279f2af7726ddf15b08c'
          'SKIP'
          '1c7c2d0338939a9e6953a64d80861471'
          'a81346cce95baeac2c56cf60d3c7e5b6'
          '8f2743651280f5a022e541f4e95e5546'
          '69d50a4604a587ae770e4be244e293bd'
-         '3ed89f690f4a0bc6754099711b8316eb'
+         'b42dc69e16c46b0bd958c2a479eefe06'
          '60bc3624123c183305677097bcd56212'
-         '03280af2abd709412f209cb219c1dd88'
-         'e983ba82eaa9a4e585258205e8214055')
+         'a6acd6dcde67323db7dd3ab72a5deee2'
+         '4b0c73aadc2bf864a7b2e9194b2cc8e8')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-raspberrypi/config.txt b/core/linux-raspberrypi/config.txt
index ea95cbade..0bb6db9eb 100644
--- a/core/linux-raspberrypi/config.txt
+++ b/core/linux-raspberrypi/config.txt
@@ -112,6 +112,8 @@
 #device_tree_overlay=hy28b
 #device_tree_overlay=piscreen
 #device_tree_overlay=rpi-display
+#device_tree_overlay=pitft28-resistive
+#device_tree_overlay=mz61581
 
 # Uncomment to enable the Microchip ENC28J60 Ethernet Controller
 #device_tree_overlay=enc28j60
diff --git a/core/linux-raspberrypi/config.v6 b/core/linux-raspberrypi/config.v6
index 183f487bb..542f219bb 100644
--- a/core/linux-raspberrypi/config.v6
+++ b/core/linux-raspberrypi/config.v6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.8-3 Kernel Configuration
+# Linux/arm 3.18.8-4 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1877,6 +1877,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
+CONFIG_TOUCHSCREEN_STMPE=m
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
@@ -2114,6 +2115,7 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
@@ -2137,6 +2139,7 @@ CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
+CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
 
@@ -2446,7 +2449,13 @@ CONFIG_MFD_88PM805=m
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
diff --git a/core/linux-raspberrypi/config.v7 b/core/linux-raspberrypi/config.v7
index 3dd61348b..5efadd940 100644
--- a/core/linux-raspberrypi/config.v7
+++ b/core/linux-raspberrypi/config.v7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.8-3 Kernel Configuration
+# Linux/arm 3.18.8-4 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1968,6 +1968,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
+CONFIG_TOUCHSCREEN_STMPE=m
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
@@ -2205,6 +2206,7 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
 CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
 
@@ -2228,6 +2230,7 @@ CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_SX150X is not set
+CONFIG_GPIO_STMPE=y
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
 
@@ -2537,7 +2540,13 @@ CONFIG_MFD_88PM805=m
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+CONFIG_STMPE_SPI=y
 # CONFIG_MFD_SYSCON is not set
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set