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>
2013-05-15 01:21:50 +08:00 · 2013-05-15 01:21:50 +08:00 · 6db64d2978
parent f722406faa
commit 6db64d2978
47 changed files with 61 additions and 61 deletions
--- a/arch/arm/boot/dts/aks-cdu.dts
+++ b/arch/arm/boot/dts/aks-cdu.dts
@ -9,7 +9,7 @@

 /dts-v1/;

-/include/ "ge863-pro3.dtsi"
+#include "ge863-pro3.dtsi"

 / {
 	chosen {
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@ -7,7 +7,7 @@
 */

 /dts-v1/;
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"

 / {
 	model = "Somfy Animeo IP";
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g15.dtsi
+++ b/arch/arm/boot/dts/at91sam9g15.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"

 / {
 	model = "Atmel AT91SAM9G15 SoC";
--- a/arch/arm/boot/dts/at91sam9g15ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"

 / {
 	model = "Atmel AT91SAM9G20 family SoC";
--- a/arch/arm/boot/dts/at91sam9g20ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@ -5,7 +5,7 @@
 *
 * Licensed under GPLv2.
 */
-/include/ "at91sam9g20.dtsi"
+#include "at91sam9g20.dtsi"

 / {

--- a/arch/arm/boot/dts/at91sam9g25.dtsi
+++ b/arch/arm/boot/dts/at91sam9g25.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"

 / {
 	model = "Atmel AT91SAM9G25 SoC";
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g35.dtsi
+++ b/arch/arm/boot/dts/at91sam9g35.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"

 / {
 	model = "Atmel AT91SAM9G35 SoC";
--- a/arch/arm/boot/dts/at91sam9g35ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9x25.dtsi
+++ b/arch/arm/boot/dts/at91sam9x25.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"

 / {
 	model = "Atmel AT91SAM9X25 SoC";
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9x35.dtsi
+++ b/arch/arm/boot/dts/at91sam9x35.dtsi
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */

-/include/ "at91sam9x5.dtsi"
+#include "at91sam9x5.dtsi"

 / {
 	model = "Atmel AT91SAM9X35 SoC";
--- a/arch/arm/boot/dts/at91sam9x35ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/ethernut5.dts
+++ b/arch/arm/boot/dts/ethernut5.dts
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */
 /dts-v1/;
-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"

 / {
 	model = "Ethernut 5";
--- a/arch/arm/boot/dts/evk-pro3.dts
+++ b/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 @@ i2c@0 {
 		status = "okay";
 	};

-};
+};
--- a/arch/arm/boot/dts/ge863-pro3.dtsi
+++ b/arch/arm/boot/dts/ge863-pro3.dtsi
@ -7,7 +7,7 @@
 * Licensed under GPLv2 or later.
 */

-/include/ "at91sam9260.dtsi"
+#include "at91sam9260.dtsi"

 / {
 	clocks {
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/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 @@ mode {
 			gpio-key,wakeup;
 		};
 	};
-};
+};
--- a/arch/arm/boot/dts/mpa1600.dts
+++ b/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";
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */
 /dts-v1/;
-/include/ "at91sam9g45.dtsi"
+#include "at91sam9g45.dtsi"

 / {
 	model = "Ronetix pm9g45";
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/sama5d31ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/sama5d33ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/sama5d34ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/sama5d35ek.dts
+++ b/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";
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/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";
--- a/arch/arm/boot/dts/tny_a9260.dts
+++ b/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";
--- a/arch/arm/boot/dts/tny_a9263.dts
+++ b/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";
--- a/arch/arm/boot/dts/tny_a9g20.dts
+++ b/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";
--- a/arch/arm/boot/dts/usb_a9260.dts
+++ b/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";
--- a/arch/arm/boot/dts/usb_a9263.dts
+++ b/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";
--- a/arch/arm/boot/dts/usb_a9g20.dts
+++ b/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";