summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2015-10-31 04:35:52 +0000
committerDenys Dmytriyenko <denys@ti.com>2015-11-03 15:57:01 -0500
commitd913fef3788faa3e5bbe561e9f9edf0f95dae7d1 (patch)
tree6cfd7ff6ad38249702452aa8e423854605e93374 /recipes-kernel
parent644ab65a9ee8426b63537811c7bec41039bc4a5a (diff)
downloadmeta-ti-d913fef3788faa3e5bbe561e9f9edf0f95dae7d1.tar.gz
linux-ti-staging: remove unused patches/configs
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch36
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch150
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch102
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch96
-rw-r--r--recipes-kernel/linux/linux-ti-staging-4.1/sgx.cfg1
5 files changed, 0 insertions, 385 deletions
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
deleted file mode 100644
index 12dd52fd..00000000
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From ea8c16f49b043f4f096909e0d7bc0b9d248aafce Mon Sep 17 00:00:00 2001
2From: Pantelis Antoniou <panto@antoniou-consulting.com>
3Date: Fri, 28 Aug 2015 06:17:59 +0000
4Subject: [PATCH 5/8] arm: Export cache flush management symbols when
5 !MULTI_CACHE
6
7When compiling a kernel without CONFIG_MULTI_CACHE enabled the
8dma access functions end up not being exported. Fix it.
9
10Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
12Signed-off-by: Eric Ruei <e-ruei1@ti.com>
13---
14 arch/arm/kernel/setup.c | 9 +++++++++
15 1 file changed, 9 insertions(+)
16
17diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
18index 979c1c5..063165d 100644
19--- a/arch/arm/kernel/setup.c
20+++ b/arch/arm/kernel/setup.c
21@@ -1137,3 +1137,12 @@ const struct seq_operations cpuinfo_op = {
22 .stop = c_stop,
23 .show = c_show
24 };
25+
26+/* export the cache management functions */
27+#ifndef MULTI_CACHE
28+
29+EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area));
30+EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
31+EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
32+
33+#endif
34--
352.2.0
36
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
deleted file mode 100644
index 03dc2878..00000000
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch
+++ /dev/null
@@ -1,150 +0,0 @@
1From 29ce4cbb157611004fb1908b949ac54ca396ca5d Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Fri, 28 Aug 2015 06:18:00 +0000
4Subject: [PATCH 6/8] ARM: dts: am33xx: add DT node for gpu
5
6Add the node into the am33xx.dtsi file for the SGX GPU.
7
8Signed-off-by: Darren Etheridge <detheridge@ti.com>
9Signed-off-by: Eric Ruei <e-ruei1@ti.com>
10---
11 arch/arm/boot/dts/am335x-bone.dts | 4 ++++
12 arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++
13 arch/arm/boot/dts/am335x-evm.dts | 5 +++++
14 arch/arm/boot/dts/am335x-evmsk.dts | 4 ++++
15 arch/arm/boot/dts/am335x-lxm.dts | 3 +++
16 arch/arm/boot/dts/am335x-nano.dts | 4 ++++
17 arch/arm/boot/dts/am335x-pepper.dts | 4 ++++
18 arch/arm/boot/dts/am33xx.dtsi | 8 ++++++++
19 8 files changed, 36 insertions(+)
20 mode change 100644 => 100755 arch/arm/boot/dts/am335x-bone.dts
21 mode change 100644 => 100755 arch/arm/boot/dts/am335x-evm.dts
22 mode change 100644 => 100755 arch/arm/boot/dts/am335x-evmsk.dts
23 mode change 100644 => 100755 arch/arm/boot/dts/am335x-lxm.dts
24 mode change 100644 => 100755 arch/arm/boot/dts/am335x-nano.dts
25 mode change 100644 => 100755 arch/arm/boot/dts/am335x-pepper.dts
26 mode change 100644 => 100755 arch/arm/boot/dts/am33xx.dtsi
27
28diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
29old mode 100644
30new mode 100755
31index 6b849372..ce1b68a
32--- a/arch/arm/boot/dts/am335x-bone.dts
33+++ b/arch/arm/boot/dts/am335x-bone.dts
34@@ -24,3 +24,7 @@
35 &mmc1 {
36 vmmc-supply = <&ldo3_reg>;
37 };
38+
39+&sgx {
40+ status = "okay";
41+};
42diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
43index 34c9928..369f34d 100644
44--- a/arch/arm/boot/dts/am335x-boneblack.dts
45+++ b/arch/arm/boot/dts/am335x-boneblack.dts
46@@ -33,6 +33,10 @@
47 status = "okay";
48 };
49
50+&sgx {
51+ status = "okay";
52+};
53+
54 &am33xx_pinmux {
55 nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
56 pinctrl-single,pins = <
57diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
58old mode 100644
59new mode 100755
60index 8704195..2414437
61--- a/arch/arm/boot/dts/am335x-evm.dts
62+++ b/arch/arm/boot/dts/am335x-evm.dts
63@@ -905,3 +905,8 @@
64 &rtc {
65 system-power-controller;
66 };
67+
68+&sgx {
69+ status = "okay";
70+};
71+
72diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
73old mode 100644
74new mode 100755
75index 3c54b90..74d1943
76--- a/arch/arm/boot/dts/am335x-evmsk.dts
77+++ b/arch/arm/boot/dts/am335x-evmsk.dts
78@@ -729,3 +729,7 @@
79 &lcdc {
80 status = "okay";
81 };
82+
83+&sgx {
84+ status = "okay";
85+};
86diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
87old mode 100644
88new mode 100755
89index 5c5667a..c7c51b4
90--- a/arch/arm/boot/dts/am335x-lxm.dts
91+++ b/arch/arm/boot/dts/am335x-lxm.dts
92@@ -364,3 +364,6 @@
93 status = "okay";
94 };
95
96+&sgx {
97+ status = "okay";
98+};
99diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
100old mode 100644
101new mode 100755
102index 5ed4ca6..7dc4b13
103--- a/arch/arm/boot/dts/am335x-nano.dts
104+++ b/arch/arm/boot/dts/am335x-nano.dts
105@@ -438,3 +438,7 @@
106 };
107 };
108 };
109+
110+&sgx {
111+ status = "okay";
112+};
113diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
114old mode 100644
115new mode 100755
116index 0d35ab6..67e032d9
117--- a/arch/arm/boot/dts/am335x-pepper.dts
118+++ b/arch/arm/boot/dts/am335x-pepper.dts
119@@ -651,3 +651,7 @@
120 >;
121 };
122 };
123+
124+&sgx {
125+ status = "okay";
126+};
127diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
128old mode 100644
129new mode 100755
130index 308ec9a..86631ba
131--- a/arch/arm/boot/dts/am33xx.dtsi
132+++ b/arch/arm/boot/dts/am33xx.dtsi
133@@ -880,6 +880,14 @@
134 reg = <0x48310000 0x2000>;
135 interrupts = <111>;
136 };
137+
138+ sgx: sgx@0x56000000 {
139+ compatible = "ti,am335x-sgx530", "img,sgx530";
140+ ti,hwmods = "gfx";
141+ reg = <0x56000000 0x1000000>;
142+ interrupts = <37>;
143+ status = "disabled";
144+ };
145 };
146 };
147
148--
1492.2.0
150
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
deleted file mode 100644
index 540f5ccb..00000000
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0007-ARM-dts-am437x-add-DT-node-for-gpu.patch
+++ /dev/null
@@ -1,102 +0,0 @@
1From 975c3e8be136fc459688c5d5e9daf272e6092af0 Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Fri, 28 Aug 2015 06:18:01 +0000
4Subject: [PATCH 7/8] ARM: dts: am437x: add DT node for gpu
5
6Add dt node to enable SGX PowerVR driver in AM437x base dtsi file.
7
8Signed-off-by: Darren Etheridge <detheridge@ti.com>
9Signed-off-by: Eric Ruei <e-ruei1@ti.com>
10---
11 arch/arm/boot/dts/am4372.dtsi | 8 ++++++++
12 arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++++
13 arch/arm/boot/dts/am437x-idk-evm.dts | 4 ++++
14 arch/arm/boot/dts/am437x-sk-evm.dts | 4 ++++
15 arch/arm/boot/dts/am43x-epos-evm.dts | 4 ++++
16 5 files changed, 24 insertions(+)
17 mode change 100644 => 100755 arch/arm/boot/dts/am4372.dtsi
18 mode change 100644 => 100755 arch/arm/boot/dts/am437x-gp-evm.dts
19 mode change 100644 => 100755 arch/arm/boot/dts/am437x-idk-evm.dts
20 mode change 100644 => 100755 arch/arm/boot/dts/am437x-sk-evm.dts
21 mode change 100644 => 100755 arch/arm/boot/dts/am43x-epos-evm.dts
22
23diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
24old mode 100644
25new mode 100755
26index 72009c2..4fc40b2
27--- a/arch/arm/boot/dts/am4372.dtsi
28+++ b/arch/arm/boot/dts/am4372.dtsi
29@@ -789,6 +789,14 @@
30 dma-names = "tx", "rx";
31 };
32
33+ sgx: sgx@0x56000000 {
34+ compatible = "ti,am437x-sgx530", "img,sgx530";
35+ ti,hwmods = "gfx";
36+ reg = <0x56000000 0x1000000>;
37+ interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
38+ status = "disabled";
39+ };
40+
41 rng: rng@48310000 {
42 compatible = "ti,omap4-rng";
43 ti,hwmods = "rng";
44diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
45old mode 100644
46new mode 100755
47index 5a26668..bbd3f84
48--- a/arch/arm/boot/dts/am437x-gp-evm.dts
49+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
50@@ -1241,3 +1241,7 @@
51 status = "okay";
52 ext-clk-src;
53 };
54+
55+&sgx {
56+ status = "okay";
57+};
58diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
59old mode 100644
60new mode 100755
61index f7d8656..ea017df
62--- a/arch/arm/boot/dts/am437x-idk-evm.dts
63+++ b/arch/arm/boot/dts/am437x-idk-evm.dts
64@@ -405,3 +405,7 @@
65 &cpu {
66 cpu0-supply = <&tps>;
67 };
68+
69+&sgx {
70+ status = "okay";
71+};
72diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
73old mode 100644
74new mode 100755
75index 5506e91..55a1263
76--- a/arch/arm/boot/dts/am437x-sk-evm.dts
77+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
78@@ -758,3 +758,7 @@
79 &wkup_m3_ipc {
80 ti,scale-data-fw = "am43x-evm-scale-data.bin";
81 };
82+
83+&sgx {
84+ status = "okay";
85+};
86diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
87old mode 100644
88new mode 100755
89index 92515b3..c9e3dbb
90--- a/arch/arm/boot/dts/am43x-epos-evm.dts
91+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
92@@ -869,3 +869,7 @@
93 &cpu {
94 cpu0-supply = <&dcdc2>;
95 };
96+
97+&sgx {
98+ status = "okay";
99+};
100--
1012.2.0
102
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
deleted file mode 100644
index a3168497..00000000
--- a/recipes-kernel/linux/linux-ti-staging-4.1/0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1From 306abd812cbb86a4bffe3d1aee14eb77cc6b1458 Mon Sep 17 00:00:00 2001
2From: Darren Etheridge <detheridge@ti.com>
3Date: Fri, 28 Aug 2015 06:18:02 +0000
4Subject: [PATCH 8/8] ARM: OMAP2+: Use pdata-quirks for sgx deassert_hardreset
5
6Use pdata_quirks to provide platform data to the sgx driver. This is used
7to provide a function pointer for the sgx driver to access
8omap_device_deassert_hardreset along with the reset name as defined in the
9corresponding hwmod entry.
10
11This platform data will not be required when a seperate reset driver is
12available allowing decoupling from omap_hwmod and omap_device.
13
14Signed-off-by: Darren Etheridge <detheridge@ti.com>
15Signed-off-by: Eric Ruei <e-ruei1@ti.com>
16---
17 arch/arm/mach-omap2/pdata-quirks.c | 16 +++++++++++++++-
18 include/linux/platform_data/sgx-omap.h | 22 ++++++++++++++++++++++
19 2 files changed, 37 insertions(+), 1 deletion(-)
20 mode change 100644 => 100755 arch/arm/mach-omap2/pdata-quirks.c
21 create mode 100755 include/linux/platform_data/sgx-omap.h
22
23diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
24old mode 100644
25new mode 100755
26index 1377979..f62ad71
27--- a/arch/arm/mach-omap2/pdata-quirks.c
28+++ b/arch/arm/mach-omap2/pdata-quirks.c
29@@ -19,6 +19,7 @@
30 #include <linux/platform_data/iommu-omap.h>
31 #include <linux/platform_data/remoteproc-omap.h>
32 #include <linux/platform_data/wkup_m3.h>
33+#include <linux/platform_data/sgx-omap.h>
34 #include <linux/platform_data/pci-dra7xx.h>
35
36 #include "common.h"
37@@ -37,7 +38,12 @@ struct pdata_init {
38
39 struct of_dev_auxdata omap_auxdata_lookup[];
40 static struct twl4030_gpio_platform_data twl_gpio_auxdata;
41-
42+#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
43+static struct gfx_sgx_platform_data sgx_pdata = {
44+ .reset_name = "gfx",
45+ .deassert_reset = omap_device_deassert_hardreset,
46+};
47+#endif
48 #if IS_ENABLED(CONFIG_OMAP_IOMMU)
49 int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,
50 u8 *pwrst);
51@@ -377,6 +383,14 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
52 OF_DEV_AUXDATA("ti,am3352-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
53 &wkup_m3_data),
54 #endif
55+#if defined(CONFIG_SOC_AM33XX)
56+ OF_DEV_AUXDATA("ti,am335x-sgx530", 0x56000000, "56000000.sgx",
57+ &sgx_pdata),
58+#endif
59+#if defined(CONFIG_SOC_AM43XX)
60+ OF_DEV_AUXDATA("ti,am437x-sgx530", 0x56000000, "56000000.sgx",
61+ &sgx_pdata),
62+#endif
63 #ifdef CONFIG_ARCH_OMAP4
64 OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),
65 OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a31e040, "4a31e040.pinmux", &pcs_pdata),
66diff --git a/include/linux/platform_data/sgx-omap.h b/include/linux/platform_data/sgx-omap.h
67new file mode 100755
68index 0000000..aa59b2c
69--- /dev/null
70+++ b/include/linux/platform_data/sgx-omap.h
71@@ -0,0 +1,22 @@
72+/*
73+ * SGX Graphics Driver Platform Data
74+ *
75+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
76+ * Darren Etheridge <detheridge@ti.com>
77+ *
78+ * This program is free software; you can redistribute it and/or modify
79+ * it under the terms of the GNU General Public License version 2 as
80+ * published by the Free Software Foundation.
81+ *
82+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
83+ * kind, whether express or implied; without even the implied warranty
84+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
85+ * GNU General Public License for more details.
86+ */
87+#include <linux/platform_device.h>
88+
89+struct gfx_sgx_platform_data {
90+ const char *reset_name;
91+
92+ int (*deassert_reset)(struct platform_device *pdev, const char *name);
93+};
94--
952.2.0
96
diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/sgx.cfg b/recipes-kernel/linux/linux-ti-staging-4.1/sgx.cfg
deleted file mode 100644
index 37e19a3d..00000000
--- a/recipes-kernel/linux/linux-ti-staging-4.1/sgx.cfg
+++ /dev/null
@@ -1 +0,0 @@
1CONFIG_DRM_OMAP_SGX_PLUGIN=y
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 05:27:18 +0000