Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Florian Vaussard and committed by
Benoit Cousson
eb33ef66 6cfd8117

+8 -8
+1 -1
arch/arm/boot/dts/am335x-bone.dts
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - /include/ "am33xx.dtsi" 10 + #include "am33xx.dtsi" 11 11 12 12 / { 13 13 model = "TI AM335x BeagleBone";
+2 -2
arch/arm/boot/dts/am335x-evm.dts
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - /include/ "am33xx.dtsi" 10 + #include "am33xx.dtsi" 11 11 12 12 / { 13 13 model = "TI AM335x EVM"; ··· 301 301 }; 302 302 }; 303 303 304 - /include/ "tps65910.dtsi" 304 + #include "tps65910.dtsi" 305 305 306 306 &tps { 307 307 vcc1-supply = <&vbat>;
+2 -2
arch/arm/boot/dts/am335x-evmsk.dts
··· 13 13 14 14 /dts-v1/; 15 15 16 - /include/ "am33xx.dtsi" 16 + #include "am33xx.dtsi" 17 17 18 18 / { 19 19 model = "TI AM335x EVM-SK"; ··· 201 201 }; 202 202 }; 203 203 204 - /include/ "tps65910.dtsi" 204 + #include "tps65910.dtsi" 205 205 206 206 &tps { 207 207 vcc1-supply = <&vbat>;
+1 -1
arch/arm/boot/dts/am33xx.dtsi
··· 8 8 * kind, whether express or implied. 9 9 */ 10 10 11 - /include/ "skeleton.dtsi" 11 + #include "skeleton.dtsi" 12 12 13 13 / { 14 14 compatible = "ti,am33xx";
+1 -1
arch/arm/boot/dts/am3517-evm.dts
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - /include/ "omap34xx.dtsi" 10 + #include "omap34xx.dtsi" 11 11 12 12 / { 13 13 model = "TI AM3517 EVM (AM3517/05)";
+1 -1
arch/arm/boot/dts/am3517_mt_ventoux.dts
··· 7 7 */ 8 8 /dts-v1/; 9 9 10 - /include/ "omap34xx.dtsi" 10 + #include "omap34xx.dtsi" 11 11 12 12 / { 13 13 model = "TeeJet Mt.Ventoux";