diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2013-05-31 08:32:55 -0400 |
---|---|---|
committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-06-18 19:53:38 -0400 |
commit | 98ef795714a31b3470e9fdd6e977f6733b83f101 (patch) | |
tree | e4967de6b9b47a8edfb190d32e1c8c86f7f9f316 /arch | |
parent | fdc6a2ddd8ee033ffcd8a63ea81a96272587da04 (diff) |
ARM: dts: OMAP2+: Use #include for all device trees
Replace /include/ by #include for OMAP2+ DT, in order to use the
C pre-processor, making use of #define features possible.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Diffstat (limited to 'arch')
29 files changed, 44 insertions, 44 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi index 37aa7487d4d8..e6e4587b2a4d 100644 --- a/arch/arm/boot/dts/omap2.dtsi +++ b/arch/arm/boot/dts/omap2.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; | 14 | compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; |
diff --git a/arch/arm/boot/dts/omap2420-h4.dts b/arch/arm/boot/dts/omap2420-h4.dts index 68282ee13e26..224c08f472f4 100644 --- a/arch/arm/boot/dts/omap2420-h4.dts +++ b/arch/arm/boot/dts/omap2420-h4.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap2420.dtsi" | 10 | #include "omap2420.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP2420 H4 board"; | 13 | model = "TI OMAP2420 H4 board"; |
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi index da5b285b73be..c8f9c55169ea 100644 --- a/arch/arm/boot/dts/omap2420.dtsi +++ b/arch/arm/boot/dts/omap2420.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "omap2.dtsi" | 11 | #include "omap2.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | compatible = "ti,omap2420", "ti,omap2"; | 14 | compatible = "ti,omap2420", "ti,omap2"; |
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi index 054bc4439568..c535a5a2b27f 100644 --- a/arch/arm/boot/dts/omap2430.dtsi +++ b/arch/arm/boot/dts/omap2430.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "omap2.dtsi" | 11 | #include "omap2.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | compatible = "ti,omap2430", "ti,omap2"; | 14 | compatible = "ti,omap2430", "ti,omap2"; |
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 3046d1f81be0..e0ce823d20b0 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap36xx.dtsi" | 10 | #include "omap36xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP3 BeagleBoard xM"; | 13 | model = "TI OMAP3 BeagleBoard xM"; |
@@ -75,7 +75,7 @@ | |||
75 | }; | 75 | }; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | /include/ "twl4030.dtsi" | 78 | #include "twl4030.dtsi" |
79 | 79 | ||
80 | &i2c2 { | 80 | &i2c2 { |
81 | clock-frequency = <400000>; | 81 | clock-frequency = <400000>; |
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 6eec69997607..fcac96aac3e6 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap34xx.dtsi" | 10 | #include "omap34xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP3 BeagleBoard"; | 13 | model = "TI OMAP3 BeagleBoard"; |
@@ -107,7 +107,7 @@ | |||
107 | }; | 107 | }; |
108 | }; | 108 | }; |
109 | 109 | ||
110 | /include/ "twl4030.dtsi" | 110 | #include "twl4030.dtsi" |
111 | 111 | ||
112 | &mmc1 { | 112 | &mmc1 { |
113 | vmmc-supply = <&vmmc1>; | 113 | vmmc-supply = <&vmmc1>; |
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts index 8a5cdcc6debd..8d0f5e40eafe 100644 --- a/arch/arm/boot/dts/omap3-devkit8000.dts +++ b/arch/arm/boot/dts/omap3-devkit8000.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap34xx.dtsi" | 10 | #include "omap34xx.dtsi" |
11 | / { | 11 | / { |
12 | model = "TimLL OMAP3 Devkit8000"; | 12 | model = "TimLL OMAP3 Devkit8000"; |
13 | compatible = "timll,omap3-devkit8000", "ti,omap3"; | 13 | compatible = "timll,omap3-devkit8000", "ti,omap3"; |
@@ -80,7 +80,7 @@ | |||
80 | status = "disabled"; | 80 | status = "disabled"; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | /include/ "twl4030.dtsi" | 83 | #include "twl4030.dtsi" |
84 | 84 | ||
85 | &mmc1 { | 85 | &mmc1 { |
86 | vmmc-supply = <&vmmc1>; | 86 | vmmc-supply = <&vmmc1>; |
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts index 96d1c206a57b..d75759b59841 100644 --- a/arch/arm/boot/dts/omap3-evm.dts +++ b/arch/arm/boot/dts/omap3-evm.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap34xx.dtsi" | 10 | #include "omap34xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)"; | 13 | model = "TI OMAP3 EVM (OMAP3530, AM/DM37x)"; |
@@ -44,7 +44,7 @@ | |||
44 | }; | 44 | }; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | /include/ "twl4030.dtsi" | 47 | #include "twl4030.dtsi" |
48 | 48 | ||
49 | &i2c2 { | 49 | &i2c2 { |
50 | clock-frequency = <400000>; | 50 | clock-frequency = <400000>; |
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi index d5cd504bc180..d1d2ba7a9390 100644 --- a/arch/arm/boot/dts/omap3-igep.dtsi +++ b/arch/arm/boot/dts/omap3-igep.dtsi | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | /dts-v1/; | 11 | /dts-v1/; |
12 | 12 | ||
13 | /include/ "omap34xx.dtsi" | 13 | #include "omap34xx.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | memory { | 16 | memory { |
@@ -86,7 +86,7 @@ | |||
86 | }; | 86 | }; |
87 | }; | 87 | }; |
88 | 88 | ||
89 | /include/ "twl4030.dtsi" | 89 | #include "twl4030.dtsi" |
90 | 90 | ||
91 | &i2c2 { | 91 | &i2c2 { |
92 | clock-frequency = <400000>; | 92 | clock-frequency = <400000>; |
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts index 0ba43136a37f..c50ce5927af7 100644 --- a/arch/arm/boot/dts/omap3-igep0020.dts +++ b/arch/arm/boot/dts/omap3-igep0020.dts | |||
@@ -9,7 +9,7 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /include/ "omap3-igep.dtsi" | 12 | #include "omap3-igep.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "IGEPv2"; | 15 | model = "IGEPv2"; |
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index f65bc3a87bbe..5061a27563b6 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts | |||
@@ -9,7 +9,7 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /include/ "omap3-igep.dtsi" | 12 | #include "omap3-igep.dtsi" |
13 | 13 | ||
14 | / { | 14 | / { |
15 | model = "IGEP COM Module"; | 15 | model = "IGEP COM Module"; |
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi index a626c50041f6..e112a424c7a5 100644 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | /include/ "omap34xx.dtsi" | 14 | #include "omap34xx.dtsi" |
15 | 15 | ||
16 | / { | 16 | / { |
17 | pwmleds { | 17 | pwmleds { |
@@ -49,7 +49,7 @@ | |||
49 | }; | 49 | }; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | /include/ "twl4030.dtsi" | 52 | #include "twl4030.dtsi" |
53 | 53 | ||
54 | /* i2c2 pins are used for gpio */ | 54 | /* i2c2 pins are used for gpio */ |
55 | &i2c2 { | 55 | &i2c2 { |
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts index a13d12de77ff..5df894f8bdef 100644 --- a/arch/arm/boot/dts/omap3-tobi.dts +++ b/arch/arm/boot/dts/omap3-tobi.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | * Tobi expansion board is manufactured by Gumstix Inc. | 10 | * Tobi expansion board is manufactured by Gumstix Inc. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | /include/ "omap3-overo.dtsi" | 13 | #include "omap3-overo.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "TI OMAP3 Gumstix Overo on Tobi"; | 16 | model = "TI OMAP3 Gumstix Overo on Tobi"; |
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 99ba6e14ebf3..a0a7b447e48f 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | compatible = "ti,omap3430", "ti,omap3"; | 14 | compatible = "ti,omap3430", "ti,omap3"; |
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index 144ae43453c4..2a725a041668 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap34xx.dtsi" | 10 | #include "omap34xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP3430 SDP"; | 13 | model = "TI OMAP3430 SDP"; |
@@ -28,7 +28,7 @@ | |||
28 | }; | 28 | }; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | /include/ "twl4030.dtsi" | 31 | #include "twl4030.dtsi" |
32 | 32 | ||
33 | &mmc1 { | 33 | &mmc1 { |
34 | vmmc-supply = <&vmmc1>; | 34 | vmmc-supply = <&vmmc1>; |
diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi index 75ed4ae2e631..5355d6173748 100644 --- a/arch/arm/boot/dts/omap34xx.dtsi +++ b/arch/arm/boot/dts/omap34xx.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "omap3.dtsi" | 11 | #include "omap3.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | cpus { | 14 | cpus { |
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi index f3447bc1b032..f8b3765eb9be 100644 --- a/arch/arm/boot/dts/omap36xx.dtsi +++ b/arch/arm/boot/dts/omap36xx.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "omap3.dtsi" | 11 | #include "omap3.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | aliases { | 14 | aliases { |
diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts index e30cdf0f5ac1..f18fb5c25395 100644 --- a/arch/arm/boot/dts/omap4-panda-a4.dts +++ b/arch/arm/boot/dts/omap4-panda-a4.dts | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap443x.dtsi" | 10 | #include "omap443x.dtsi" |
11 | /include/ "omap4-panda-common.dtsi" | 11 | #include "omap4-panda-common.dtsi" |
12 | 12 | ||
13 | /* Pandaboard Rev A4+ have external pullups on SCL & SDA */ | 13 | /* Pandaboard Rev A4+ have external pullups on SCL & SDA */ |
14 | &dss_hdmi_pins { | 14 | &dss_hdmi_pins { |
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index eeb734e25709..171a18533703 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi | |||
@@ -5,7 +5,7 @@ | |||
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | /include/ "elpida_ecb240abacn.dtsi" | 8 | #include "elpida_ecb240abacn.dtsi" |
9 | 9 | ||
10 | / { | 10 | / { |
11 | model = "TI OMAP4 PandaBoard"; | 11 | model = "TI OMAP4 PandaBoard"; |
@@ -184,7 +184,7 @@ | |||
184 | }; | 184 | }; |
185 | }; | 185 | }; |
186 | 186 | ||
187 | /include/ "twl6030.dtsi" | 187 | #include "twl6030.dtsi" |
188 | 188 | ||
189 | &i2c2 { | 189 | &i2c2 { |
190 | pinctrl-names = "default"; | 190 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index f1d8c217ce12..c6f012ed2a1c 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap4460.dtsi" | 10 | #include "omap4460.dtsi" |
11 | /include/ "omap4-panda-common.dtsi" | 11 | #include "omap4-panda-common.dtsi" |
12 | 12 | ||
13 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ | 13 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ |
14 | &sound { | 14 | &sound { |
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index f8b221f0168e..6189a8b77d7f 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts | |||
@@ -7,5 +7,5 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap443x.dtsi" | 10 | #include "omap443x.dtsi" |
11 | /include/ "omap4-panda-common.dtsi" | 11 | #include "omap4-panda-common.dtsi" |
diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts index b4a40ffbce31..4f26355bfed1 100644 --- a/arch/arm/boot/dts/omap4-sdp-es23plus.dts +++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts | |||
@@ -5,7 +5,7 @@ | |||
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | /include/ "omap4-sdp.dts" | 8 | #include "omap4-sdp.dts" |
9 | 9 | ||
10 | /* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ | 10 | /* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ |
11 | &dss_hdmi_pins { | 11 | &dss_hdmi_pins { |
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 98505a2ef162..fc7c7f490e94 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap443x.dtsi" | 10 | #include "omap443x.dtsi" |
11 | /include/ "elpida_ecb240abacn.dtsi" | 11 | #include "elpida_ecb240abacn.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "TI OMAP4 SDP board"; | 14 | model = "TI OMAP4 SDP board"; |
@@ -336,7 +336,7 @@ | |||
336 | }; | 336 | }; |
337 | }; | 337 | }; |
338 | 338 | ||
339 | /include/ "twl6030.dtsi" | 339 | #include "twl6030.dtsi" |
340 | 340 | ||
341 | &i2c2 { | 341 | &i2c2 { |
342 | pinctrl-names = "default"; | 342 | pinctrl-names = "default"; |
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts index 7e04103779c4..6593607bf2a6 100644 --- a/arch/arm/boot/dts/omap4-var-som.dts +++ b/arch/arm/boot/dts/omap4-var-som.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap443x.dtsi" | 10 | #include "omap443x.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "Variscite OMAP4 SOM"; | 13 | model = "Variscite OMAP4 SOM"; |
@@ -39,7 +39,7 @@ | |||
39 | }; | 39 | }; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | /include/ "twl6030.dtsi" | 42 | #include "twl6030.dtsi" |
43 | 43 | ||
44 | &i2c2 { | 44 | &i2c2 { |
45 | clock-frequency = <400000>; | 45 | clock-frequency = <400000>; |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 006563eec767..7fe2c1883899 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -6,7 +6,7 @@ | |||
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | /include/ "skeleton.dtsi" | 9 | #include "skeleton.dtsi" |
10 | 10 | ||
11 | / { | 11 | / { |
12 | compatible = "ti,omap4430", "ti,omap4"; | 12 | compatible = "ti,omap4430", "ti,omap4"; |
diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi index cccf39af4925..a81f8dfb836b 100644 --- a/arch/arm/boot/dts/omap443x.dtsi +++ b/arch/arm/boot/dts/omap443x.dtsi | |||
@@ -8,7 +8,7 @@ | |||
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /include/ "omap4.dtsi" | 11 | #include "omap4.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | cpus { | 14 | cpus { |
diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi index 2cf227c86099..41762c263a62 100644 --- a/arch/arm/boot/dts/omap4460.dtsi +++ b/arch/arm/boot/dts/omap4460.dtsi | |||
@@ -7,7 +7,7 @@ | |||
7 | * version 2. This program is licensed "as is" without any warranty of any | 7 | * version 2. This program is licensed "as is" without any warranty of any |
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | /include/ "omap4.dtsi" | 10 | #include "omap4.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | cpus { | 13 | cpus { |
diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-evm.dts index 982acd19477d..f5f55d1d88fa 100644 --- a/arch/arm/boot/dts/omap5-evm.dts +++ b/arch/arm/boot/dts/omap5-evm.dts | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap5.dtsi" | 10 | #include "omap5.dtsi" |
11 | /include/ "samsung_k3pe0e000b.dtsi" | 11 | #include "samsung_k3pe0e000b.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "TI OMAP5 EVM board"; | 14 | model = "TI OMAP5 EVM board"; |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 28ec8061757a..2a48a029a23f 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -7,7 +7,7 @@ | |||
7 | * Based on "omap4.dtsi" | 7 | * Based on "omap4.dtsi" |
8 | */ | 8 | */ |
9 | 9 | ||
10 | /include/ "skeleton.dtsi" | 10 | #include "skeleton.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | #address-cells = <1>; | 13 | #address-cells = <1>; |