diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2013-06-03 10:12:22 -0400 |
---|---|---|
committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-06-18 19:53:41 -0400 |
commit | eb33ef6619f57304cecc644bfe934f6833da53fb (patch) | |
tree | 49845729fd6b5fc7f4e4550be4b7d4a619c9984b | |
parent | 6cfd8117f5722689a9125b5b30302dbe9025b663 (diff) |
ARM: dts: AM3XXX: Use #include for all device trees
Replace /include/ by #include for AM33XX and AM35XX device tree
files, in order to use the C pre-processor, making use of #define
features possible.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/am335x-bone.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/am33xx.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/am3517-evm.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 74bfcc611051..0365e56e02b5 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "am33xx.dtsi" | 10 | #include "am33xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI AM335x BeagleBone"; | 13 | model = "TI AM335x BeagleBone"; |
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 4dc46fa7ce1c..93027736b20b 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "am33xx.dtsi" | 10 | #include "am33xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI AM335x EVM"; | 13 | model = "TI AM335x EVM"; |
@@ -301,7 +301,7 @@ | |||
301 | }; | 301 | }; |
302 | }; | 302 | }; |
303 | 303 | ||
304 | /include/ "tps65910.dtsi" | 304 | #include "tps65910.dtsi" |
305 | 305 | ||
306 | &tps { | 306 | &tps { |
307 | vcc1-supply = <&vbat>; | 307 | vcc1-supply = <&vbat>; |
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 4d81dbcb53ea..83ded8e3b3b2 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | 15 | ||
16 | /include/ "am33xx.dtsi" | 16 | #include "am33xx.dtsi" |
17 | 17 | ||
18 | / { | 18 | / { |
19 | model = "TI AM335x EVM-SK"; | 19 | model = "TI AM335x EVM-SK"; |
@@ -201,7 +201,7 @@ | |||
201 | }; | 201 | }; |
202 | }; | 202 | }; |
203 | 203 | ||
204 | /include/ "tps65910.dtsi" | 204 | #include "tps65910.dtsi" |
205 | 205 | ||
206 | &tps { | 206 | &tps { |
207 | vcc1-supply = <&vbat>; | 207 | vcc1-supply = <&vbat>; |
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 7818bf497e31..f6a0117d5c06 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.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,am33xx"; | 14 | compatible = "ti,am33xx"; |
diff --git a/arch/arm/boot/dts/am3517-evm.dts b/arch/arm/boot/dts/am3517-evm.dts index e9b5bdae4908..e99dfaf70052 100644 --- a/arch/arm/boot/dts/am3517-evm.dts +++ b/arch/arm/boot/dts/am3517-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 AM3517 EVM (AM3517/05)"; | 13 | model = "TI AM3517 EVM (AM3517/05)"; |
diff --git a/arch/arm/boot/dts/am3517_mt_ventoux.dts b/arch/arm/boot/dts/am3517_mt_ventoux.dts index 556868388a23..fdf5ce63c8e6 100644 --- a/arch/arm/boot/dts/am3517_mt_ventoux.dts +++ b/arch/arm/boot/dts/am3517_mt_ventoux.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 = "TeeJet Mt.Ventoux"; | 13 | model = "TeeJet Mt.Ventoux"; |