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

ARM: imx: use #include for all device trees

Replace /include/ (dtc) with #include (C pre-processor) for all imx DT
files, so that gcc -E handles the entire include tree, and hence any of
those files can #include some other file e.g. for constant definitions.

This allows future use of #defines and header files in order to define
names for various constants, such as pinctrl settings. Use of those
features will increase the readability of the device tree files.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Shawn Guo 36dffd8f a10c22e4

+26 -26
+1 -1
arch/arm/boot/dts/imx25-karo-tx25.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "imx25.dtsi" 13 + #include "imx25.dtsi" 14 14 15 15 / { 16 16 model = "Ka-Ro TX25";
+1 -1
arch/arm/boot/dts/imx25-pdk.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "imx25.dtsi" 13 + #include "imx25.dtsi" 14 14 15 15 / { 16 16 model = "Freescale i.MX25 Product Development Kit";
+1 -1
arch/arm/boot/dts/imx25.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include "skeleton.dtsi" 13 13 14 14 / { 15 15 aliases {
+1 -1
arch/arm/boot/dts/imx27-apf27.dts
··· 13 13 */ 14 14 15 15 /dts-v1/; 16 - /include/ "imx27.dtsi" 16 + #include "imx27.dtsi" 17 17 18 18 / { 19 19 model = "Armadeus Systems APF27 module";
+1 -1
arch/arm/boot/dts/imx27-pdk.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "imx27.dtsi" 13 + #include "imx27.dtsi" 14 14 15 15 / { 16 16 model = "Freescale i.MX27 Product Development Kit";
+1 -1
arch/arm/boot/dts/imx27-phytec-phycore.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "imx27.dtsi" 13 + #include "imx27.dtsi" 14 14 15 15 / { 16 16 model = "Phytec pcm038";
+1 -1
arch/arm/boot/dts/imx27.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include "skeleton.dtsi" 13 13 14 14 / { 15 15 aliases {
+1 -1
arch/arm/boot/dts/imx31-bug.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "imx31.dtsi" 13 + #include "imx31.dtsi" 14 14 15 15 / { 16 16 model = "Buglabs i.MX31 Bug 1.x";
+1 -1
arch/arm/boot/dts/imx31.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include "skeleton.dtsi" 13 13 14 14 / { 15 15 aliases {
+1 -1
arch/arm/boot/dts/imx51-apf51.dts
··· 15 15 */ 16 16 17 17 /dts-v1/; 18 - /include/ "imx51.dtsi" 18 + #include "imx51.dtsi" 19 19 20 20 / { 21 21 model = "Armadeus Systems APF51 module";
+1 -1
arch/arm/boot/dts/imx51-babbage.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx51.dtsi" 14 + #include "imx51.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX51 Babbage Board";
+1 -1
arch/arm/boot/dts/imx51.dtsi
··· 10 10 * http://www.gnu.org/copyleft/gpl.html 11 11 */ 12 12 13 - /include/ "skeleton.dtsi" 13 + #include "skeleton.dtsi" 14 14 15 15 / { 16 16 aliases {
+1 -1
arch/arm/boot/dts/imx53-ard.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx53.dtsi" 14 + #include "imx53.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX53 Automotive Reference Design Board";
+1 -1
arch/arm/boot/dts/imx53-evk.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx53.dtsi" 14 + #include "imx53.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX53 Evaluation Kit";
+1 -1
arch/arm/boot/dts/imx53-mba53.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx53-tqma53.dtsi" 14 + #include "imx53-tqma53.dtsi" 15 15 16 16 / { 17 17 model = "TQ MBa53 starter kit";
+1 -1
arch/arm/boot/dts/imx53-qsb.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx53.dtsi" 14 + #include "imx53.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX53 Quick Start Board";
+1 -1
arch/arm/boot/dts/imx53-smd.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx53.dtsi" 14 + #include "imx53.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX53 Smart Mobile Reference Design Board";
+1 -1
arch/arm/boot/dts/imx53-tqma53.dtsi
··· 10 10 * http://www.gnu.org/copyleft/gpl.html 11 11 */ 12 12 13 - /include/ "imx53.dtsi" 13 + #include "imx53.dtsi" 14 14 15 15 / { 16 16 model = "TQ TQMa53";
+1 -1
arch/arm/boot/dts/imx53.dtsi
··· 10 10 * http://www.gnu.org/copyleft/gpl.html 11 11 */ 12 12 13 - /include/ "skeleton.dtsi" 13 + #include "skeleton.dtsi" 14 14 15 15 / { 16 16 aliases {
+1 -1
arch/arm/boot/dts/imx6dl.dtsi
··· 7 7 * 8 8 */ 9 9 10 - /include/ "imx6qdl.dtsi" 10 + #include "imx6qdl.dtsi" 11 11 12 12 / { 13 13 cpus {
+1 -1
arch/arm/boot/dts/imx6q-arm2.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx6q.dtsi" 14 + #include "imx6q.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX6 Quad Armadillo2 Board";
+1 -1
arch/arm/boot/dts/imx6q-sabreauto.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx6q.dtsi" 14 + #include "imx6q.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX6 Quad SABRE Automotive Board";
+1 -1
arch/arm/boot/dts/imx6q-sabrelite.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx6q.dtsi" 14 + #include "imx6q.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX6 Quad SABRE Lite Board";
+1 -1
arch/arm/boot/dts/imx6q-sabresd.dts
··· 11 11 */ 12 12 13 13 /dts-v1/; 14 - /include/ "imx6q.dtsi" 14 + #include "imx6q.dtsi" 15 15 16 16 / { 17 17 model = "Freescale i.MX6Q SABRE Smart Device Board";
+1 -1
arch/arm/boot/dts/imx6q.dtsi
··· 8 8 * 9 9 */ 10 10 11 - /include/ "imx6qdl.dtsi" 11 + #include "imx6qdl.dtsi" 12 12 13 13 / { 14 14 cpus {
+1 -1
arch/arm/boot/dts/imx6qdl.dtsi
··· 10 10 * http://www.gnu.org/copyleft/gpl.html 11 11 */ 12 12 13 - /include/ "skeleton.dtsi" 13 + #include "skeleton.dtsi" 14 14 15 15 / { 16 16 aliases {