linux-ti-staging: bump rev, update GFX patches w/ AM3/AM4 support

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

9 files changed, 408 insertions, 19 deletions

diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch
index e7cf88f6..00628a6c 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0001-DT-gpu-add-binding-for-TI-SGX-driver.patch
@@ -1,7 +1,7 @@
-From 4b4e3b2f13798a581171abb09b400c033ece9211 Mon Sep 17 00:00:00 2001
+From 4b375ae644830ea38d8bfc1c78da6d83628527ea Mon Sep 17 00:00:00 2001
 From: Anand Balagopalakrishnan <anandb@ti.com>
 Date: Wed, 26 Aug 2015 09:34:49 +0000
-Subject: [PATCH 1/4] DT: gpu: add binding for TI SGX driver
+Subject: [PATCH 1/8] DT: gpu: add binding for TI SGX driver
 
 This patch adds the devicetree binding for TI SGX device driver.
 
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch
index ac168c79..ca84e279 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch
@@ -1,7 +1,7 @@
-From 20d10ea071c2b9eebb740f94f1fd0a7e4c9f7c03 Mon Sep 17 00:00:00 2001
+From f3a4651fef3c51a0ec30f321352dc26273eb56d4 Mon Sep 17 00:00:00 2001
 From: Anand Balagopalakrishnan <anandb@ti.com>
 Date: Wed, 26 Aug 2015 09:34:50 +0000
-Subject: [PATCH 2/4] ARM: dts: DRA7xx: add device tree entry for SGX
+Subject: [PATCH 2/8] ARM: dts: DRA7xx: add device tree entry for SGX
 
 Addition of SGX to DRA7xx DTS to enable graphics support.
 
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch
index 57ee2689..7c74b243 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0003-arm-dra7xx-Add-gpu-hwmod-data.patch
@@ -1,7 +1,7 @@
-From cbfdfed432347a3c52cf1c62cba5141b540d8d09 Mon Sep 17 00:00:00 2001
+From 7d96508055ba60029f6fc7a3f8603f2f2630a667 Mon Sep 17 00:00:00 2001
 From: Hemant Hariyani <hemanthariyani@ti.com>
 Date: Wed, 26 Aug 2015 09:34:51 +0000
-Subject: [PATCH 3/4] arm:dra7xx: Add gpu hwmod data
+Subject: [PATCH 3/8] arm:dra7xx: Add gpu hwmod data
 
 GPU hwmod data for DRA7xx
 
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch
index c89a49dd..e09325ab 100644
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0004-drm-omap-Add-omapdrm-plugin-API.patch
@@ -1,7 +1,7 @@
-From a5ddaecfdf950bd47560ac0a9b1ca9e57afc0c2e Mon Sep 17 00:00:00 2001
+From 931f19bb07833a342e1d87785e989f4609825927 Mon Sep 17 00:00:00 2001
 From: Rob Clark <rob@ti.com>
 Date: Wed, 26 Aug 2015 09:34:52 +0000
-Subject: [PATCH 4/4] drm/omap: Add omapdrm plugin API
+Subject: [PATCH 4/8] drm/omap: Add omapdrm plugin API
 
 This patch enables SGX driver to be added as a plugin to omapdrm.
 
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch
new file mode 100644
index 00000000..12dd52fd
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch
@@ -0,0 +1,36 @@
+From ea8c16f49b043f4f096909e0d7bc0b9d248aafce Mon Sep 17 00:00:00 2001
+From: Pantelis Antoniou <panto@antoniou-consulting.com>
+Date: Fri, 28 Aug 2015 06:17:59 +0000
+Subject: [PATCH 5/8] arm: Export cache flush management symbols when
+ !MULTI_CACHE
+
+When compiling a kernel without CONFIG_MULTI_CACHE enabled the
+dma access functions end up not being exported. Fix it.
+
+Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/kernel/setup.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index 979c1c5..063165d 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -1137,3 +1137,12 @@ const struct seq_operations cpuinfo_op = {
+        .stop   = c_stop,
+        .show   = c_show
+ };
++
++/* export the cache management functions */
++#ifndef MULTI_CACHE
++
++EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
++EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
++
++#endif
+-- 
+2.2.0
+
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch
new file mode 100644
index 00000000..03dc2878
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch
@@ -0,0 +1,150 @@
+From 29ce4cbb157611004fb1908b949ac54ca396ca5d Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:00 +0000
+Subject: [PATCH 6/8] ARM: dts: am33xx: add DT node for gpu
+
+Add the node into the am33xx.dtsi file for the SGX GPU.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/boot/dts/am335x-bone.dts      | 4 ++++
+ arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++
+ arch/arm/boot/dts/am335x-evm.dts       | 5 +++++
+ arch/arm/boot/dts/am335x-evmsk.dts     | 4 ++++
+ arch/arm/boot/dts/am335x-lxm.dts       | 3 +++
+ arch/arm/boot/dts/am335x-nano.dts      | 4 ++++
+ arch/arm/boot/dts/am335x-pepper.dts    | 4 ++++
+ arch/arm/boot/dts/am33xx.dtsi          | 8 ++++++++
+ 8 files changed, 36 insertions(+)
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-bone.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-evmsk.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-lxm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-nano.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am335x-pepper.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am33xx.dtsi
+
+diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
+old mode 100644
+new mode 100755
+index 6b849372..ce1b68a
+--- a/arch/arm/boot/dts/am335x-bone.dts
++++ b/arch/arm/boot/dts/am335x-bone.dts
+@@ -24,3 +24,7 @@
+ &mmc1 {
+        vmmc-supply = <&ldo3_reg>;
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index 34c9928..369f34d 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -33,6 +33,10 @@
+        status = "okay";
+ };
+ 
++&sgx {
++       status = "okay";
++};
++
+ &am33xx_pinmux {
+        nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
+                pinctrl-single,pins = <
+diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
+old mode 100644
+new mode 100755
+index 8704195..2414437
+--- a/arch/arm/boot/dts/am335x-evm.dts
++++ b/arch/arm/boot/dts/am335x-evm.dts
+@@ -905,3 +905,8 @@
+ &rtc {
+        system-power-controller;
+ };
++
++&sgx {
++       status = "okay";
++};
++
+diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
+old mode 100644
+new mode 100755
+index 3c54b90..74d1943
+--- a/arch/arm/boot/dts/am335x-evmsk.dts
++++ b/arch/arm/boot/dts/am335x-evmsk.dts
+@@ -729,3 +729,7 @@
+ &lcdc {
+       status = "okay";
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
+old mode 100644
+new mode 100755
+index 5c5667a..c7c51b4
+--- a/arch/arm/boot/dts/am335x-lxm.dts
++++ b/arch/arm/boot/dts/am335x-lxm.dts
+@@ -364,3 +364,6 @@
+        status = "okay";
+ };
+ 
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
+old mode 100644
+new mode 100755
+index 5ed4ca6..7dc4b13
+--- a/arch/arm/boot/dts/am335x-nano.dts
++++ b/arch/arm/boot/dts/am335x-nano.dts
+@@ -438,3 +438,7 @@
+                };
+        };
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
+old mode 100644
+new mode 100755
+index 0d35ab6..67e032d9
+--- a/arch/arm/boot/dts/am335x-pepper.dts
++++ b/arch/arm/boot/dts/am335x-pepper.dts
+@@ -651,3 +651,7 @@
+                >;
+        };
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
+old mode 100644
+new mode 100755
+index 308ec9a..86631ba
+--- a/arch/arm/boot/dts/am33xx.dtsi
++++ b/arch/arm/boot/dts/am33xx.dtsi
+@@ -880,6 +880,14 @@
+                        reg = <0x48310000 0x2000>;
+                        interrupts = <111>;
+                };
++
++               sgx: sgx@0x56000000 {
++                       compatible = "ti,am335x-sgx530", "img,sgx530";
++                       ti,hwmods = "gfx";
++                       reg = <0x56000000 0x1000000>;
++                       interrupts = <37>;
++                       status = "disabled";
++               };
+        };
+ };
+ 
+-- 
+2.2.0
+
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch
new file mode 100644
index 00000000..540f5ccb
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch
@@ -0,0 +1,102 @@
+From 975c3e8be136fc459688c5d5e9daf272e6092af0 Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:01 +0000
+Subject: [PATCH 7/8] ARM: dts: am437x: add DT node for gpu
+
+Add dt node to enable SGX PowerVR driver in AM437x base dtsi file.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/boot/dts/am4372.dtsi        | 8 ++++++++
+ arch/arm/boot/dts/am437x-gp-evm.dts  | 4 ++++
+ arch/arm/boot/dts/am437x-idk-evm.dts | 4 ++++
+ arch/arm/boot/dts/am437x-sk-evm.dts  | 4 ++++
+ arch/arm/boot/dts/am43x-epos-evm.dts | 4 ++++
+ 5 files changed, 24 insertions(+)
+ mode change 100644 => 100755 arch/arm/boot/dts/am4372.dtsi
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-gp-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-idk-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am437x-sk-evm.dts
+ mode change 100644 => 100755 arch/arm/boot/dts/am43x-epos-evm.dts
+
+diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
+old mode 100644
+new mode 100755
+index 72009c2..4fc40b2
+--- a/arch/arm/boot/dts/am4372.dtsi
++++ b/arch/arm/boot/dts/am4372.dtsi
+@@ -789,6 +789,14 @@
+                        dma-names = "tx", "rx";
+                };
+ 
++               sgx: sgx@0x56000000 {
++                       compatible = "ti,am437x-sgx530", "img,sgx530";
++                       ti,hwmods = "gfx";
++                       reg = <0x56000000 0x1000000>;
++                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
++                       status = "disabled";
++               };
++
+                rng: rng@48310000 {
+                        compatible = "ti,omap4-rng";
+                        ti,hwmods = "rng";
+diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
+old mode 100644
+new mode 100755
+index 5a26668..bbd3f84
+--- a/arch/arm/boot/dts/am437x-gp-evm.dts
++++ b/arch/arm/boot/dts/am437x-gp-evm.dts
+@@ -1241,3 +1241,7 @@
+        status = "okay";
+        ext-clk-src;
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
+old mode 100644
+new mode 100755
+index f7d8656..ea017df
+--- a/arch/arm/boot/dts/am437x-idk-evm.dts
++++ b/arch/arm/boot/dts/am437x-idk-evm.dts
+@@ -405,3 +405,7 @@
+ &cpu {
+        cpu0-supply = <&tps>;
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
+old mode 100644
+new mode 100755
+index 5506e91..55a1263
+--- a/arch/arm/boot/dts/am437x-sk-evm.dts
++++ b/arch/arm/boot/dts/am437x-sk-evm.dts
+@@ -758,3 +758,7 @@
+ &wkup_m3_ipc {
+        ti,scale-data-fw = "am43x-evm-scale-data.bin";
+ };
++
++&sgx {
++       status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
+old mode 100644
+new mode 100755
+index 92515b3..c9e3dbb
+--- a/arch/arm/boot/dts/am43x-epos-evm.dts
++++ b/arch/arm/boot/dts/am43x-epos-evm.dts
+@@ -869,3 +869,7 @@
+ &cpu {
+        cpu0-supply = <&dcdc2>;
+ };
++
++&sgx {
++       status = "okay";
++};
+-- 
+2.2.0
+
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch b/recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
new file mode 100644
index 00000000..a3168497
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
@@ -0,0 +1,96 @@
+From 306abd812cbb86a4bffe3d1aee14eb77cc6b1458 Mon Sep 17 00:00:00 2001
+From: Darren Etheridge <detheridge@ti.com>
+Date: Fri, 28 Aug 2015 06:18:02 +0000
+Subject: [PATCH 8/8] ARM: OMAP2+: Use pdata-quirks for sgx deassert_hardreset
+
+Use pdata_quirks to provide platform data to the sgx driver.  This is used
+to provide a function pointer for the sgx driver to access
+omap_device_deassert_hardreset along with the reset name as defined in the
+corresponding hwmod entry.
+
+This platform data will not be required when a seperate reset driver is
+available allowing decoupling from omap_hwmod and omap_device.
+
+Signed-off-by: Darren Etheridge <detheridge@ti.com>
+Signed-off-by: Eric Ruei <e-ruei1@ti.com>
+---
+ arch/arm/mach-omap2/pdata-quirks.c     | 16 +++++++++++++++-
+ include/linux/platform_data/sgx-omap.h | 22 ++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 1 deletion(-)
+ mode change 100644 => 100755 arch/arm/mach-omap2/pdata-quirks.c
+ create mode 100755 include/linux/platform_data/sgx-omap.h
+
+diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
+old mode 100644
+new mode 100755
+index 1377979..f62ad71
+--- a/arch/arm/mach-omap2/pdata-quirks.c
++++ b/arch/arm/mach-omap2/pdata-quirks.c
+@@ -19,6 +19,7 @@
+ #include <linux/platform_data/iommu-omap.h>
+ #include <linux/platform_data/remoteproc-omap.h>
+ #include <linux/platform_data/wkup_m3.h>
++#include <linux/platform_data/sgx-omap.h>
+ #include <linux/platform_data/pci-dra7xx.h>
+ 
+ #include "common.h"
+@@ -37,7 +38,12 @@ struct pdata_init {
+ 
+ struct of_dev_auxdata omap_auxdata_lookup[];
+ static struct twl4030_gpio_platform_data twl_gpio_auxdata;
+-
++#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
++static struct gfx_sgx_platform_data sgx_pdata = {
++       .reset_name = "gfx",
++       .deassert_reset = omap_device_deassert_hardreset,
++};
++#endif
+ #if IS_ENABLED(CONFIG_OMAP_IOMMU)
+ int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,
+                                    u8 *pwrst);
+@@ -377,6 +383,14 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
+        OF_DEV_AUXDATA("ti,am3352-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
+                       &wkup_m3_data),
+ #endif
++#if defined(CONFIG_SOC_AM33XX)
++       OF_DEV_AUXDATA("ti,am335x-sgx530", 0x56000000, "56000000.sgx",
++                      &sgx_pdata),
++#endif
++#if defined(CONFIG_SOC_AM43XX)
++       OF_DEV_AUXDATA("ti,am437x-sgx530", 0x56000000, "56000000.sgx",
++                      &sgx_pdata),
++#endif
+ #ifdef CONFIG_ARCH_OMAP4
+        OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
+        OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
+diff --git a/include/linux/platform_data/sgx-omap.h b/include/linux/platform_data/sgx-omap.h
+new file mode 100755
+index 0000000..aa59b2c
+--- /dev/null
++++ b/include/linux/platform_data/sgx-omap.h
+@@ -0,0 +1,22 @@
++/*
++ * SGX Graphics Driver Platform Data
++ *
++ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
++ *     Darren Etheridge <detheridge@ti.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
++ * kind, whether express or implied; without even the implied warranty
++ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ */
++#include <linux/platform_device.h>
++
++struct gfx_sgx_platform_data {
++       const char *reset_name;
++
++       int (*deassert_reset)(struct platform_device *pdev, const char *name);
++};
+-- 
+2.2.0
+
diff --git a/recipes-kernel/linux/linux-ti-staging_4.1.bb b/recipes-kernel/linux/linux-ti-staging_4.1.bb
index dff9867f..e67cc158 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.1.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.1.bb
@@ -50,11 +50,11 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-lsk-linux-4.1.y"
 
-SRCREV = "4d8b97ba78fe68be2ce19008a6968a2aea0af8bb"
+SRCREV = "20d5e1664b054e8775f4023d65f16b2a1efc8dda"
 PV = "4.1.6+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "d"
+MACHINE_KERNEL_PR_append = "e"
 PR = "${MACHINE_KERNEL_PR}"
 
 KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
@@ -68,12 +68,17 @@ MULTI_CONFIG_BASE_SUFFIX = ""
 KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
-            file://defconfig \
-           "
-
-GFX_PATCHES = "file://0001-DT-gpu-add-binding-for-TI-SGX-driver.patch \
-            file://0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch \
-            file://0003-arm-dra7xx-Add-gpu-hwmod-data.patch \
-            file://0004-drm-omap-Add-omapdrm-plugin-API.patch"
-
-SRC_URI_append_dra7xx = " ${GFX_PATCHES}"
+            file://defconfig"
+
+GFX_PATCHES =  "file://0001-DT-gpu-add-binding-for-TI-SGX-driver.patch \
+                file://0002-ARM-dts-DRA7xx-add-device-tree-entry-for-SGX.patch \
+                file://0003-arm-dra7xx-Add-gpu-hwmod-data.patch \
+                file://0004-drm-omap-Add-omapdrm-plugin-API.patch \
+                file://0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
+                file://0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch \
+                file://0007-ARM-dts-am437x-add-DT-node-for-gpu.patch \
+                file://0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch"
+
+SRC_URI_append_omap-a15 = " ${GFX_PATCHES}"
+SRC_URI_append_ti33x = " ${GFX_PATCHES}"
+SRC_URI_append_ti43x = " ${GFX_PATCHES}"