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

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>

authored by

Jean-Christophe PLAGNIOL-VILLARD and committed by
Nicolas Ferre
6db64d29 f722406f

+59 -59
+1 -1
arch/arm/boot/dts/aks-cdu.dts
··· 9 9 10 10 /dts-v1/; 11 11 12 - /include/ "ge863-pro3.dtsi" 12 + #include "ge863-pro3.dtsi" 13 13 14 14 / { 15 15 chosen {
+1 -1
arch/arm/boot/dts/animeo_ip.dts
··· 7 7 */ 8 8 9 9 /dts-v1/; 10 - /include/ "at91sam9260.dtsi" 10 + #include "at91sam9260.dtsi" 11 11 12 12 / { 13 13 model = "Somfy Animeo IP";
+1 -1
arch/arm/boot/dts/at91-ariag25.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9g25.dtsi" 10 + #include "at91sam9g25.dtsi" 11 11 12 12 / { 13 13 model = "Acme Systems Aria G25";
+1 -1
arch/arm/boot/dts/at91rm9200.dtsi
··· 10 10 * Licensed under GPLv2 or later. 11 11 */ 12 12 13 - /include/ "skeleton.dtsi" 13 + #include "skeleton.dtsi" 14 14 15 15 / { 16 16 model = "Atmel AT91RM9200 family SoC";
+1 -1
arch/arm/boot/dts/at91rm9200ek.dts
··· 6 6 * Licensed under GPLv2 only 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91rm9200.dtsi" 9 + #include "at91rm9200.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91RM9200 evaluation kit";
+1 -1
arch/arm/boot/dts/at91sam9260.dtsi
··· 8 8 * Licensed under GPLv2 or later. 9 9 */ 10 10 11 - /include/ "skeleton.dtsi" 11 + #include "skeleton.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9260 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9263.dtsi
··· 6 6 * Licensed under GPLv2 only. 7 7 */ 8 8 9 - /include/ "skeleton.dtsi" 9 + #include "skeleton.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9263 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9263ek.dts
··· 6 6 * Licensed under GPLv2 only 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9263.dtsi" 9 + #include "at91sam9263.dtsi" 10 10 11 11 / { 12 12 model = "Atmel at91sam9263ek";
+1 -1
arch/arm/boot/dts/at91sam9g15.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9x5.dtsi" 9 + #include "at91sam9x5.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9G15 SoC";
+2 -2
arch/arm/boot/dts/at91sam9g15ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9g15.dtsi" 11 - /include/ "at91sam9x5ek.dtsi" 10 + #include "at91sam9g15.dtsi" 11 + #include "at91sam9x5ek.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9G15-EK";
+1 -1
arch/arm/boot/dts/at91sam9g20.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9260.dtsi" 9 + #include "at91sam9260.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9G20 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9g20ek.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g20ek_common.dtsi" 9 + #include "at91sam9g20ek_common.dtsi" 10 10 11 11 / { 12 12 model = "Atmel at91sam9g20ek";
+1 -1
arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g20ek_common.dtsi" 9 + #include "at91sam9g20ek_common.dtsi" 10 10 11 11 / { 12 12 model = "Atmel at91sam9g20ek 2 mmc";
+1 -1
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
··· 5 5 * 6 6 * Licensed under GPLv2. 7 7 */ 8 - /include/ "at91sam9g20.dtsi" 8 + #include "at91sam9g20.dtsi" 9 9 10 10 / { 11 11
+1 -1
arch/arm/boot/dts/at91sam9g25.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9x5.dtsi" 9 + #include "at91sam9x5.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9G25 SoC";
+2 -2
arch/arm/boot/dts/at91sam9g25ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9g25.dtsi" 11 - /include/ "at91sam9x5ek.dtsi" 10 + #include "at91sam9g25.dtsi" 11 + #include "at91sam9x5ek.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9G25-EK";
+1 -1
arch/arm/boot/dts/at91sam9g35.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9x5.dtsi" 9 + #include "at91sam9x5.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9G35 SoC";
+2 -2
arch/arm/boot/dts/at91sam9g35ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9g35.dtsi" 11 - /include/ "at91sam9x5ek.dtsi" 10 + #include "at91sam9g35.dtsi" 11 + #include "at91sam9x5ek.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9G35-EK";
+1 -1
arch/arm/boot/dts/at91sam9g45.dtsi
··· 9 9 * Licensed under GPLv2 or later. 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include "skeleton.dtsi" 13 13 14 14 / { 15 15 model = "Atmel AT91SAM9G45 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9m10g45ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9g45.dtsi" 10 + #include "at91sam9g45.dtsi" 11 11 12 12 / { 13 13 model = "Atmel AT91SAM9M10G45-EK";
+1 -1
arch/arm/boot/dts/at91sam9n12.dtsi
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 10 - /include/ "skeleton.dtsi" 10 + #include "skeleton.dtsi" 11 11 12 12 / { 13 13 model = "Atmel AT91SAM9N12 SoC";
+1 -1
arch/arm/boot/dts/at91sam9n12ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9n12.dtsi" 10 + #include "at91sam9n12.dtsi" 11 11 12 12 / { 13 13 model = "Atmel AT91SAM9N12-EK";
+1 -1
arch/arm/boot/dts/at91sam9x25.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9x5.dtsi" 9 + #include "at91sam9x5.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9X25 SoC";
+2 -2
arch/arm/boot/dts/at91sam9x25ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9x25.dtsi" 11 - /include/ "at91sam9x5ek.dtsi" 10 + #include "at91sam9x25.dtsi" 11 + #include "at91sam9x5ek.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9G25-EK";
+1 -1
arch/arm/boot/dts/at91sam9x35.dtsi
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 9 - /include/ "at91sam9x5.dtsi" 9 + #include "at91sam9x5.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9X35 SoC";
+2 -2
arch/arm/boot/dts/at91sam9x35ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "at91sam9x35.dtsi" 11 - /include/ "at91sam9x5ek.dtsi" 10 + #include "at91sam9x35.dtsi" 11 + #include "at91sam9x5ek.dtsi" 12 12 13 13 / { 14 14 model = "Atmel AT91SAM9X35-EK";
+1 -1
arch/arm/boot/dts/at91sam9x5.dtsi
··· 9 9 * Licensed under GPLv2 or later. 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include "skeleton.dtsi" 13 13 14 14 / { 15 15 model = "Atmel AT91SAM9x5 family SoC";
+1 -1
arch/arm/boot/dts/at91sam9x5ek.dtsi
··· 6 6 * 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 - /include/ "at91sam9x5cm.dtsi" 9 + #include "at91sam9x5cm.dtsi" 10 10 11 11 / { 12 12 model = "Atmel AT91SAM9X5-EK";
+1 -1
arch/arm/boot/dts/ethernut5.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9260.dtsi" 9 + #include "at91sam9260.dtsi" 10 10 11 11 / { 12 12 model = "Ethernut 5";
+1 -1
arch/arm/boot/dts/evk-pro3.dts
··· 9 9 10 10 /dts-v1/; 11 11 12 - /include/ "ge863-pro3.dtsi" 12 + #include "ge863-pro3.dtsi" 13 13 14 14 / { 15 15 model = "Telit EVK-PRO3 for Telit GE863-PRO3";
+1 -1
arch/arm/boot/dts/ge863-pro3.dtsi
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 10 - /include/ "at91sam9260.dtsi" 10 + #include "at91sam9260.dtsi" 11 11 12 12 / { 13 13 clocks {
+1 -1
arch/arm/boot/dts/kizbox.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g20.dtsi" 9 + #include "at91sam9g20.dtsi" 10 10 11 11 / { 12 12
+1 -1
arch/arm/boot/dts/mpa1600.dts
··· 6 6 * Licensed under GPLv2 only 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91rm9200.dtsi" 9 + #include "at91rm9200.dtsi" 10 10 11 11 / { 12 12 model = "Phontech MPA 1600";
+1 -1
arch/arm/boot/dts/pm9g45.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g45.dtsi" 9 + #include "at91sam9g45.dtsi" 10 10 11 11 / { 12 12 model = "Ronetix pm9g45";
+1 -1
arch/arm/boot/dts/sama5d3.dtsi
··· 8 8 * Licensed under GPLv2 or later. 9 9 */ 10 10 11 - /include/ "skeleton.dtsi" 11 + #include "skeleton.dtsi" 12 12 13 13 / { 14 14 model = "Atmel SAMA5D3 family SoC";
+2 -2
arch/arm/boot/dts/sama5d31ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "sama5d3xmb.dtsi" 11 - /include/ "sama5d3xdm.dtsi" 10 + #include "sama5d3xmb.dtsi" 11 + #include "sama5d3xdm.dtsi" 12 12 13 13 / { 14 14 model = "Atmel SAMA5D31-EK";
+2 -2
arch/arm/boot/dts/sama5d33ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "sama5d3xmb.dtsi" 11 - /include/ "sama5d3xdm.dtsi" 10 + #include "sama5d3xmb.dtsi" 11 + #include "sama5d3xdm.dtsi" 12 12 13 13 / { 14 14 model = "Atmel SAMA5D33-EK";
+2 -2
arch/arm/boot/dts/sama5d34ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "sama5d3xmb.dtsi" 11 - /include/ "sama5d3xdm.dtsi" 10 + #include "sama5d3xmb.dtsi" 11 + #include "sama5d3xdm.dtsi" 12 12 13 13 / { 14 14 model = "Atmel SAMA5D34-EK";
+1 -1
arch/arm/boot/dts/sama5d35ek.dts
··· 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 9 /dts-v1/; 10 - /include/ "sama5d3xmb.dtsi" 10 + #include "sama5d3xmb.dtsi" 11 11 12 12 / { 13 13 model = "Atmel SAMA5D35-EK";
+1 -1
arch/arm/boot/dts/sama5d3xcm.dtsi
··· 6 6 * 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 - /include/ "sama5d3.dtsi" 9 + #include "sama5d3.dtsi" 10 10 11 11 / { 12 12 compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5";
+1 -1
arch/arm/boot/dts/sama5d3xmb.dtsi
··· 6 6 * 7 7 * Licensed under GPLv2 or later. 8 8 */ 9 - /include/ "sama5d3xcm.dtsi" 9 + #include "sama5d3xcm.dtsi" 10 10 11 11 / { 12 12 compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
+2 -2
arch/arm/boot/dts/tny_a9260.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9260.dtsi" 10 - /include/ "tny_a9260_common.dtsi" 9 + #include "at91sam9260.dtsi" 10 + #include "tny_a9260_common.dtsi" 11 11 12 12 / { 13 13 model = "Calao TNY A9260";
+1 -1
arch/arm/boot/dts/tny_a9263.dts
··· 6 6 * Licensed under GPLv2 only 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9263.dtsi" 9 + #include "at91sam9263.dtsi" 10 10 11 11 / { 12 12 model = "Calao TNY A9263";
+2 -2
arch/arm/boot/dts/tny_a9g20.dts
··· 6 6 * Licensed under GPLv2. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g20.dtsi" 10 - /include/ "tny_a9260_common.dtsi" 9 + #include "at91sam9g20.dtsi" 10 + #include "tny_a9260_common.dtsi" 11 11 12 12 / { 13 13 model = "Calao TNY A9G20";
+2 -2
arch/arm/boot/dts/usb_a9260.dts
··· 6 6 * Licensed under GPLv2 or later. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9260.dtsi" 10 - /include/ "usb_a9260_common.dtsi" 9 + #include "at91sam9260.dtsi" 10 + #include "usb_a9260_common.dtsi" 11 11 12 12 / { 13 13 model = "Calao USB A9260";
+1 -1
arch/arm/boot/dts/usb_a9263.dts
··· 6 6 * Licensed under GPLv2 only 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9263.dtsi" 9 + #include "at91sam9263.dtsi" 10 10 11 11 / { 12 12 model = "Calao USB A9263";
+2 -2
arch/arm/boot/dts/usb_a9g20.dts
··· 6 6 * Licensed under GPLv2 or later. 7 7 */ 8 8 /dts-v1/; 9 - /include/ "at91sam9g20.dtsi" 10 - /include/ "usb_a9260_common.dtsi" 9 + #include "at91sam9g20.dtsi" 10 + #include "usb_a9260_common.dtsi" 11 11 12 12 / { 13 13 model = "Calao USB A9G20";