aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-08-08 10:28:07 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-08-23 23:44:11 -0400
commit7e4f03657d3751adda76f1fecf12283bf8082af8 (patch)
tree2dbe828341505a98880ca5a862073e53d7964313 /arch/arm/boot
parent03b276505435927b5c4f7d246557a991fbedad92 (diff)
ARM: dts: imx: Move SDMA firmware to SoC dtsi file
Instead of adding sdma-ram-script-name into each board dts file, move it to the SoC dtsi file instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx51-babbage.dts4
-rw-r--r--arch/arm/boot/dts/imx51.dtsi1
-rw-r--r--arch/arm/boot/dts/imx53-ard.dts6
-rw-r--r--arch/arm/boot/dts/imx53-evk.dts4
-rw-r--r--arch/arm/boot/dts/imx53-qsb.dts4
-rw-r--r--arch/arm/boot/dts/imx53-smd.dts4
-rw-r--r--arch/arm/boot/dts/imx53.dtsi1
7 files changed, 2 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index ce08d19f8414..68460008f662 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -185,10 +185,6 @@
185 }; 185 };
186 186
187 aips@80000000 { /* aips-2 */ 187 aips@80000000 { /* aips-2 */
188 sdma@83fb0000 {
189 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
190 };
191
192 i2c@83fc4000 { /* I2C2 */ 188 i2c@83fc4000 { /* I2C2 */
193 status = "okay"; 189 status = "okay";
194 190
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 140fd28de6ab..b166e8a5242c 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -218,6 +218,7 @@
218 compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; 218 compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
219 reg = <0x83fb0000 0x4000>; 219 reg = <0x83fb0000 0x4000>;
220 interrupts = <6>; 220 interrupts = <6>;
221 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
221 }; 222 };
222 223
223 cspi@83fc0000 { 224 cspi@83fc0000 {
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index d356f10dd35a..e6a189096017 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -40,12 +40,6 @@
40 status = "okay"; 40 status = "okay";
41 }; 41 };
42 }; 42 };
43
44 aips@60000000 { /* AIPS2 */
45 sdma@63fb0000 {
46 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
47 };
48 };
49 }; 43 };
50 44
51 eim-cs1@f4000000 { 45 eim-cs1@f4000000 {
diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts
index 5d36dde14038..86aebc5b4091 100644
--- a/arch/arm/boot/dts/imx53-evk.dts
+++ b/arch/arm/boot/dts/imx53-evk.dts
@@ -73,10 +73,6 @@
73 }; 73 };
74 74
75 aips@60000000 { /* AIPS2 */ 75 aips@60000000 { /* AIPS2 */
76 sdma@63fb0000 {
77 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
78 };
79
80 i2c@63fc4000 { /* I2C2 */ 76 i2c@63fc4000 { /* I2C2 */
81 status = "okay"; 77 status = "okay";
82 78
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 3bfa6f147296..a0e816f2182b 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -52,10 +52,6 @@
52 }; 52 };
53 53
54 aips@60000000 { /* AIPS2 */ 54 aips@60000000 { /* AIPS2 */
55 sdma@63fb0000 {
56 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
57 };
58
59 i2c@63fc4000 { /* I2C2 */ 55 i2c@63fc4000 { /* I2C2 */
60 status = "okay"; 56 status = "okay";
61 57
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 45848afab1bd..8cdf0a2b0ff3 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -92,10 +92,6 @@
92 }; 92 };
93 93
94 aips@60000000 { /* AIPS2 */ 94 aips@60000000 { /* AIPS2 */
95 sdma@63fb0000 {
96 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
97 };
98
99 i2c@63fc4000 { /* I2C2 */ 95 i2c@63fc4000 { /* I2C2 */
100 status = "okay"; 96 status = "okay";
101 97
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 25b216e610f5..4994e01a1838 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -290,6 +290,7 @@
290 compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; 290 compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
291 reg = <0x63fb0000 0x4000>; 291 reg = <0x63fb0000 0x4000>;
292 interrupts = <6>; 292 interrupts = <6>;
293 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
293 }; 294 };
294 295
295 cspi@63fc0000 { 296 cspi@63fc0000 {