From fa9aead92c7f3481cdc46c2d85919d839d8aa664 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 27 Feb 2015 02:47:49 +0000
Subject: [PATCH] core/linux-raspberrypi to 3.18.7-10

---
 core/linux-raspberrypi/PKGBUILD   | 12 +++++------
 core/linux-raspberrypi/config.txt |  6 ++++++
 core/linux-raspberrypi/config.v6  | 34 ++++++++++++++++++++++++++++---
 core/linux-raspberrypi/config.v7  | 34 ++++++++++++++++++++++++++++---
 4 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index 6c8ddcfb3..8453cd938 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -7,12 +7,12 @@
 buildarch=20
 
 pkgbase=linux-raspberrypi
-_commit=11f2a1f8db91523fbcf10f8428f407cf3b37f936
+_commit=8602a3f3fc6338d690f882b5c0ae58d774cb186e
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
 pkgver=3.18.7
-pkgrel=9
+pkgrel=10
 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=('84dc791474078c1722776a3e659ae20e'
+md5sums=('a4e6dfab2dbdb27be07511c2b8d2e77c'
          'SKIP'
          '1c7c2d0338939a9e6953a64d80861471'
          'a81346cce95baeac2c56cf60d3c7e5b6'
          '8f2743651280f5a022e541f4e95e5546'
          '405015cdeb544575c25018b3487a2e76'
-         'fa4377b3247d80efade0ed3d5ec650f1'
+         'ce036a094c08855d0b7946d39b398a0c'
          '60bc3624123c183305677097bcd56212'
-         '3870d0a94f93d46e5a365feb1ff059e2'
-         '8ecb7f548b8b6d6a15316178e80513c7')
+         'd8723946c6a5dedd2188ac1d762b4d42'
+         '5be4806dbb426ae8cc7479d86b9aa638')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-raspberrypi/config.txt b/core/linux-raspberrypi/config.txt
index 8f117dfd8..2f5a6285d 100644
--- a/core/linux-raspberrypi/config.txt
+++ b/core/linux-raspberrypi/config.txt
@@ -100,6 +100,12 @@
 # Uncomment to enable the BMP085/BMP180 temperature/pressure sensor
 #device_tree_overlay=bmp085_i2c-sensor
 
+# Uncomment to enable an FB TFT module
+#device_tree_overlay=hy28a
+#device_tree_overlay=hy28b
+#device_tree_overlay=piscreen
+#device_tree_overlay=rpi-display
+
 # Uncomment if you get no picture on HDMI for a default "safe" mode
 #hdmi_safe=1
 
diff --git a/core/linux-raspberrypi/config.v6 b/core/linux-raspberrypi/config.v6
index 4cbfbf30b..8a8d336bc 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.7-9 Kernel Configuration
+# Linux/arm 3.18.7-10 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -2975,7 +2975,7 @@ CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 
@@ -3010,7 +3010,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 # CONFIG_BACKLIGHT_LM3533 is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -3742,6 +3742,34 @@ CONFIG_LTE_GDM724X=m
 # CONFIG_LUSTRE_FS is not set
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 
 #
 # SOC (System On Chip) specific Drivers
diff --git a/core/linux-raspberrypi/config.v7 b/core/linux-raspberrypi/config.v7
index 1664f964d..36584509f 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.7-9 Kernel Configuration
+# Linux/arm 3.18.7-10 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3023,7 +3023,7 @@ CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 
@@ -3058,7 +3058,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=m
 # CONFIG_BACKLIGHT_LM3533 is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -3790,6 +3790,34 @@ CONFIG_LTE_GDM724X=m
 # CONFIG_LUSTRE_FS is not set
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 
 #
 # SOC (System On Chip) specific Drivers