From f7b1140774e6c8c8aecde41388d40d9d407df6ff Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 5 Aug 2014 12:12:15 +0000 Subject: [PATCH] omap3-sgx-modules: update one of Darren's patches to match change in 3.14 API Signed-off-by: Denys Dmytriyenko Acked-by: Franklin Cooper Jr. --- ...GX-linux-use-platform-data-to-provide-reset-info.patch | 8 ++++---- .../powervr-drivers/omap3-sgx-modules_5.01.01.01.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch index 22b73fdf..5a8d1f1e 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-5.01.01.01/0002-SGX-linux-use-platform-data-to-provide-reset-info.patch @@ -1,7 +1,7 @@ -From 30a695502496302f804e14eeca90568f067b2db2 Mon Sep 17 00:00:00 2001 +From 7886ef77e4b48a7edd14acbcbe48f6a898251e78 Mon Sep 17 00:00:00 2001 From: Darren Etheridge Date: Fri, 25 Jul 2014 16:03:14 -0500 -Subject: [PATCH 2/4] SGX: linux: use platform data to provide reset info +Subject: [PATCH 2/5] SGX: linux: use platform data to provide reset info In ti-linux-3.14.y we will not have a reset driver unlike ti-linux-3.12.y so this commit removes the dependency on the reset driver and instead @@ -14,7 +14,7 @@ Signed-off-by: Darren Etheridge 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/GFX_Linux_KM/services4/srvkm/env/linux/module.c b/GFX_Linux_KM/services4/srvkm/env/linux/module.c -index e03dc00..82d07f4 100644 +index e03dc00..90e16ce 100644 --- a/GFX_Linux_KM/services4/srvkm/env/linux/module.c +++ b/GFX_Linux_KM/services4/srvkm/env/linux/module.c @@ -47,6 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -22,7 +22,7 @@ index e03dc00..82d07f4 100644 #endif +#ifndef CONFIG_RESET_CONTROLLER -+#include ++#include +#endif + #if defined(SUPPORT_DRI_DRM) && !defined(SUPPORT_DRI_DRM_PLUGIN) diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb index 0b1c06f3..a1d95bfc 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb @@ -10,7 +10,7 @@ IMGPV = "1.10.2359475" inherit module -MACHINE_KERNEL_PR_append = "b" +MACHINE_KERNEL_PR_append = "c" PR = "${MACHINE_KERNEL_PR}" BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"