Browse Source

ARM: at91: dt: use #include for all device trees

to prepare the switch to the macro.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Jean-Christophe PLAGNIOL-VILLARD 12 years ago
parent
commit
6db64d2978
47 changed files with 61 additions and 61 deletions
  1. 1 1
      arch/arm/boot/dts/aks-cdu.dts
  2. 1 1
      arch/arm/boot/dts/animeo_ip.dts
  3. 1 1
      arch/arm/boot/dts/at91-ariag25.dts
  4. 1 1
      arch/arm/boot/dts/at91rm9200.dtsi
  5. 1 1
      arch/arm/boot/dts/at91rm9200ek.dts
  6. 1 1
      arch/arm/boot/dts/at91sam9260.dtsi
  7. 1 1
      arch/arm/boot/dts/at91sam9263.dtsi
  8. 1 1
      arch/arm/boot/dts/at91sam9263ek.dts
  9. 1 1
      arch/arm/boot/dts/at91sam9g15.dtsi
  10. 2 2
      arch/arm/boot/dts/at91sam9g15ek.dts
  11. 1 1
      arch/arm/boot/dts/at91sam9g20.dtsi
  12. 1 1
      arch/arm/boot/dts/at91sam9g20ek.dts
  13. 1 1
      arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
  14. 1 1
      arch/arm/boot/dts/at91sam9g20ek_common.dtsi
  15. 1 1
      arch/arm/boot/dts/at91sam9g25.dtsi
  16. 2 2
      arch/arm/boot/dts/at91sam9g25ek.dts
  17. 1 1
      arch/arm/boot/dts/at91sam9g35.dtsi
  18. 2 2
      arch/arm/boot/dts/at91sam9g35ek.dts
  19. 1 1
      arch/arm/boot/dts/at91sam9g45.dtsi
  20. 1 1
      arch/arm/boot/dts/at91sam9m10g45ek.dts
  21. 1 1
      arch/arm/boot/dts/at91sam9n12.dtsi
  22. 1 1
      arch/arm/boot/dts/at91sam9n12ek.dts
  23. 1 1
      arch/arm/boot/dts/at91sam9x25.dtsi
  24. 2 2
      arch/arm/boot/dts/at91sam9x25ek.dts
  25. 1 1
      arch/arm/boot/dts/at91sam9x35.dtsi
  26. 2 2
      arch/arm/boot/dts/at91sam9x35ek.dts
  27. 1 1
      arch/arm/boot/dts/at91sam9x5.dtsi
  28. 1 1
      arch/arm/boot/dts/at91sam9x5ek.dtsi
  29. 1 1
      arch/arm/boot/dts/ethernut5.dts
  30. 2 2
      arch/arm/boot/dts/evk-pro3.dts
  31. 1 1
      arch/arm/boot/dts/ge863-pro3.dtsi
  32. 2 2
      arch/arm/boot/dts/kizbox.dts
  33. 1 1
      arch/arm/boot/dts/mpa1600.dts
  34. 1 1
      arch/arm/boot/dts/pm9g45.dts
  35. 1 1
      arch/arm/boot/dts/sama5d3.dtsi
  36. 2 2
      arch/arm/boot/dts/sama5d31ek.dts
  37. 2 2
      arch/arm/boot/dts/sama5d33ek.dts
  38. 2 2
      arch/arm/boot/dts/sama5d34ek.dts
  39. 1 1
      arch/arm/boot/dts/sama5d35ek.dts
  40. 1 1
      arch/arm/boot/dts/sama5d3xcm.dtsi
  41. 1 1
      arch/arm/boot/dts/sama5d3xmb.dtsi
  42. 2 2
      arch/arm/boot/dts/tny_a9260.dts
  43. 1 1
      arch/arm/boot/dts/tny_a9263.dts
  44. 2 2
      arch/arm/boot/dts/tny_a9g20.dts
  45. 2 2
      arch/arm/boot/dts/usb_a9260.dts
  46. 1 1
      arch/arm/boot/dts/usb_a9263.dts
  47. 2 2
      arch/arm/boot/dts/usb_a9g20.dts

+ 1 - 1
arch/arm/boot/dts/aks-cdu.dts

@@ -9,7 +9,7 @@
 
 /dts-v1/;
 
-/include/ "ge863-pro3.dtsi"
+#include "ge863-pro3.dtsi"
 
 / {
 	chosen {

+ 1 - 1
arch/arm/boot/dts/animeo_ip.dts

@@ -7,7 +7,7 @@
  */
 
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"
 
 / {
 	model = "Somfy Animeo IP";

+ 1 - 1
arch/arm/boot/dts/at91-ariag25.dts

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g25.dtsi"
+#include "at91sam9g25.dtsi"
 
 / {
 	model = "Acme Systems Aria G25";

+ 1 - 1
arch/arm/boot/dts/at91rm9200.dtsi

@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91RM9200 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91rm9200ek.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91rm9200.dtsi"
+#include "at91rm9200.dtsi"
 
 / {
 	model = "Atmel AT91RM9200 evaluation kit";

+ 1 - 1
arch/arm/boot/dts/at91sam9260.dtsi

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91SAM9260 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9263.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91SAM9263 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9263ek.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91sam9263.dtsi"
+#include "at91sam9263.dtsi"
 
 / {
 	model = "Atmel at91sam9263ek";

+ 1 - 1
arch/arm/boot/dts/at91sam9g15.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G15 SoC";

+ 2 - 2
arch/arm/boot/dts/at91sam9g15ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g15.dtsi"
-/include/ "at91sam9x5ek.dtsi"
+#include "at91sam9g15.dtsi"
+#include "at91sam9x5ek.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G15-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9g20.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G20 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9g20ek.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9g20ek_common.dtsi"
+#include "at91sam9g20ek_common.dtsi"
 
 / {
 	model = "Atmel at91sam9g20ek";

+ 1 - 1
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9g20ek_common.dtsi"
+#include "at91sam9g20ek_common.dtsi"
 
 / {
 	model = "Atmel at91sam9g20ek 2 mmc";

+ 1 - 1
arch/arm/boot/dts/at91sam9g20ek_common.dtsi

@@ -5,7 +5,7 @@
  *
  * Licensed under GPLv2.
  */
-/include/ "at91sam9g20.dtsi"
+#include "at91sam9g20.dtsi"
 
 / {
 

+ 1 - 1
arch/arm/boot/dts/at91sam9g25.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G25 SoC";

+ 2 - 2
arch/arm/boot/dts/at91sam9g25ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g25.dtsi"
-/include/ "at91sam9x5ek.dtsi"
+#include "at91sam9g25.dtsi"
+#include "at91sam9x5ek.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G25-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9g35.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G35 SoC";

+ 2 - 2
arch/arm/boot/dts/at91sam9g35ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g35.dtsi"
-/include/ "at91sam9x5ek.dtsi"
+#include "at91sam9g35.dtsi"
+#include "at91sam9x5ek.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G35-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9g45.dtsi

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G45 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9m10g45ek.dts

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g45.dtsi"
+#include "at91sam9g45.dtsi"
 
 / {
 	model = "Atmel AT91SAM9M10G45-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9n12.dtsi

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91SAM9N12 SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9n12ek.dts

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9n12.dtsi"
+#include "at91sam9n12.dtsi"
 
 / {
 	model = "Atmel AT91SAM9N12-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9x25.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X25 SoC";

+ 2 - 2
arch/arm/boot/dts/at91sam9x25ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9x25.dtsi"
-/include/ "at91sam9x5ek.dtsi"
+#include "at91sam9x25.dtsi"
+#include "at91sam9x5ek.dtsi"
 
 / {
 	model = "Atmel AT91SAM9G25-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9x35.dtsi

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 
-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X35 SoC";

+ 2 - 2
arch/arm/boot/dts/at91sam9x35ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9x35.dtsi"
-/include/ "at91sam9x5ek.dtsi"
+#include "at91sam9x35.dtsi"
+#include "at91sam9x5ek.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X35-EK";

+ 1 - 1
arch/arm/boot/dts/at91sam9x5.dtsi

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel AT91SAM9x5 family SoC";

+ 1 - 1
arch/arm/boot/dts/at91sam9x5ek.dtsi

@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later.
  */
-/include/ "at91sam9x5cm.dtsi"
+#include "at91sam9x5cm.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X5-EK";

+ 1 - 1
arch/arm/boot/dts/ethernut5.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"
 
 / {
 	model = "Ethernut 5";

+ 2 - 2
arch/arm/boot/dts/evk-pro3.dts

@@ -9,7 +9,7 @@
 
 /dts-v1/;
 
-/include/ "ge863-pro3.dtsi"
+#include "ge863-pro3.dtsi"
 
 / {
 	model = "Telit EVK-PRO3 for Telit GE863-PRO3";
@@ -50,4 +50,4 @@
 		status = "okay";
 	};
 
-};
+};

+ 1 - 1
arch/arm/boot/dts/ge863-pro3.dtsi

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"
 
 / {
 	clocks {

+ 2 - 2
arch/arm/boot/dts/kizbox.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9g20.dtsi"
+#include "at91sam9g20.dtsi"
 
 / {
 
@@ -137,4 +137,4 @@
 			gpio-key,wakeup;
 		};
 	};
-};
+};

+ 1 - 1
arch/arm/boot/dts/mpa1600.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91rm9200.dtsi"
+#include "at91rm9200.dtsi"
 
 / {
 	model = "Phontech MPA 1600";

+ 1 - 1
arch/arm/boot/dts/pm9g45.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9g45.dtsi"
+#include "at91sam9g45.dtsi"
 
 / {
 	model = "Ronetix pm9g45";

+ 1 - 1
arch/arm/boot/dts/sama5d3.dtsi

@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
 	model = "Atmel SAMA5D3 family SoC";

+ 2 - 2
arch/arm/boot/dts/sama5d31ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "sama5d3xmb.dtsi"
-/include/ "sama5d3xdm.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
 
 / {
 	model = "Atmel SAMA5D31-EK";

+ 2 - 2
arch/arm/boot/dts/sama5d33ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "sama5d3xmb.dtsi"
-/include/ "sama5d3xdm.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
 
 / {
 	model = "Atmel SAMA5D33-EK";

+ 2 - 2
arch/arm/boot/dts/sama5d34ek.dts

@@ -7,8 +7,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "sama5d3xmb.dtsi"
-/include/ "sama5d3xdm.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
 
 / {
 	model = "Atmel SAMA5D34-EK";

+ 1 - 1
arch/arm/boot/dts/sama5d35ek.dts

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "sama5d3xmb.dtsi"
+#include "sama5d3xmb.dtsi"
 
 / {
 	model = "Atmel SAMA5D35-EK";

+ 1 - 1
arch/arm/boot/dts/sama5d3xcm.dtsi

@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later.
  */
-/include/ "sama5d3.dtsi"
+#include "sama5d3.dtsi"
 
 / {
 	compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5";

+ 1 - 1
arch/arm/boot/dts/sama5d3xmb.dtsi

@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later.
  */
-/include/ "sama5d3xcm.dtsi"
+#include "sama5d3xcm.dtsi"
 
 / {
 	compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";

+ 2 - 2
arch/arm/boot/dts/tny_a9260.dts

@@ -6,8 +6,8 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
-/include/ "tny_a9260_common.dtsi"
+#include "at91sam9260.dtsi"
+#include "tny_a9260_common.dtsi"
 
 / {
 	model = "Calao TNY A9260";

+ 1 - 1
arch/arm/boot/dts/tny_a9263.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91sam9263.dtsi"
+#include "at91sam9263.dtsi"
 
 / {
 	model = "Calao TNY A9263";

+ 2 - 2
arch/arm/boot/dts/tny_a9g20.dts

@@ -6,8 +6,8 @@
  * Licensed under GPLv2.
  */
 /dts-v1/;
-/include/ "at91sam9g20.dtsi"
-/include/ "tny_a9260_common.dtsi"
+#include "at91sam9g20.dtsi"
+#include "tny_a9260_common.dtsi"
 
 / {
 	model = "Calao TNY A9G20";

+ 2 - 2
arch/arm/boot/dts/usb_a9260.dts

@@ -6,8 +6,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
-/include/ "usb_a9260_common.dtsi"
+#include "at91sam9260.dtsi"
+#include "usb_a9260_common.dtsi"
 
 / {
 	model = "Calao USB A9260";

+ 1 - 1
arch/arm/boot/dts/usb_a9263.dts

@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91sam9263.dtsi"
+#include "at91sam9263.dtsi"
 
 / {
 	model = "Calao USB A9263";

+ 2 - 2
arch/arm/boot/dts/usb_a9g20.dts

@@ -6,8 +6,8 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g20.dtsi"
-/include/ "usb_a9260_common.dtsi"
+#include "at91sam9g20.dtsi"
+#include "usb_a9260_common.dtsi"
 
 / {
 	model = "Calao USB A9G20";