Commit abe60a3a authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

ARM: dts: Kill off skeleton{64}.dtsi

Remove the usage of skeleton.dtsi in the remaining dts files. It was
deprecated since commit 9c0da3cc

 ("ARM: dts: explicitly mark
skeleton.dtsi as deprecated"). This will make adding a unit-address to
memory nodes easier.

The main tricky part to removing skeleton.dtsi is we could end up with
no /memory node at all when a bootloader depends on one being present. I
hacked up dtc to check for this condition.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Acked-by: default avatarAlexandre TORGUE <alexandre.torgue@st.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Tested-by: default avatarKevin Hilman <khilman@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Tested-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6569df3d
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
* Licensed under the X11 license or the GPL v2 (or later) * Licensed under the X11 license or the GPL v2 (or later)
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/alphascale,asm9260.h> #include <dt-bindings/clock/alphascale,asm9260.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&icoll>; interrupt-parent = <&icoll>;
memory { memory {
......
...@@ -25,12 +25,18 @@ ...@@ -25,12 +25,18 @@
*/ */
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton64.dtsi"
/ { / {
#address-cells = <2>;
#size-cells = <2>;
/* SOC compatibility */ /* SOC compatibility */
compatible = "al,alpine"; compatible = "al,alpine";
memory {
device_type = "memory";
reg = <0 0 0 0>;
};
/* CPU Configuration */ /* CPU Configuration */
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,realview-eb"; compatible = "arm,realview-eb";
chosen { }; chosen { };
...@@ -38,6 +39,7 @@ aliases { ...@@ -38,6 +39,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
/* 128 MiB memory @ 0x0 */ /* 128 MiB memory @ 0x0 */
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
/dts-v1/; /dts-v1/;
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "ARM RealView PB1176"; model = "ARM RealView PB1176";
compatible = "arm,realview-pb1176"; compatible = "arm,realview-pb1176";
...@@ -40,6 +41,7 @@ aliases { ...@@ -40,6 +41,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
/* 128 MiB memory @ 0x0 */ /* 128 MiB memory @ 0x0 */
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
...@@ -23,9 +23,10 @@ ...@@ -23,9 +23,10 @@
/dts-v1/; /dts-v1/;
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "ARM RealView PB11MPcore"; model = "ARM RealView PB11MPcore";
compatible = "arm,realview-pb11mp"; compatible = "arm,realview-pb11mp";
...@@ -39,6 +40,7 @@ aliases { ...@@ -39,6 +40,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
/* /*
* The PB11MPCore has 512 MiB memory @ 0x70000000 * The PB11MPCore has 512 MiB memory @ 0x70000000
* and the first 256 are also remapped @ 0x00000000 * and the first 256 are also remapped @ 0x00000000
......
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "arm,realview-pbx"; compatible = "arm,realview-pbx";
chosen { }; chosen { };
...@@ -39,6 +40,7 @@ aliases { ...@@ -39,6 +40,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
/* 128 MiB memory @ 0x0 */ /* 128 MiB memory @ 0x0 */
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
...@@ -9,13 +9,15 @@ ...@@ -9,13 +9,15 @@
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com> * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Marvell Armada 38x family SoC"; model = "Marvell Armada 38x family SoC";
compatible = "marvell,armada380"; compatible = "marvell,armada380";
......
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com> * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Marvell Armada 39x family SoC"; model = "Marvell Armada 39x family SoC";
compatible = "marvell,armada390"; compatible = "marvell,armada390";
......
...@@ -43,9 +43,10 @@ ...@@ -43,9 +43,10 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/dma/nbpfaxi.h> #include <dt-bindings/dma/nbpfaxi.h>
#include <dt-bindings/clock/axis,artpec6-clkctrl.h> #include <dt-bindings/clock/axis,artpec6-clkctrl.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "axis,artpec6"; compatible = "axis,artpec6";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
...@@ -10,13 +10,14 @@ ...@@ -10,13 +10,14 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91RM9200 family SoC"; model = "Atmel AT91RM9200 family SoC";
compatible = "atmel,at91rm9200"; compatible = "atmel,at91rm9200";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -49,6 +50,7 @@ cpu { ...@@ -49,6 +50,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x04000000>; reg = <0x20000000 0x04000000>;
}; };
......
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9260 family SoC"; model = "Atmel AT91SAM9260 family SoC";
compatible = "atmel,at91sam9260"; compatible = "atmel,at91sam9260";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -46,6 +47,7 @@ cpu { ...@@ -46,6 +47,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x04000000>; reg = <0x20000000 0x04000000>;
}; };
......
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
* Licensed under GPLv2 only. * Licensed under GPLv2 only.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9261 family SoC"; model = "Atmel AT91SAM9261 family SoC";
compatible = "atmel,at91sam9261"; compatible = "atmel,at91sam9261";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -43,6 +44,7 @@ cpu { ...@@ -43,6 +44,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x08000000>; reg = <0x20000000 0x08000000>;
}; };
......
...@@ -6,13 +6,14 @@ ...@@ -6,13 +6,14 @@
* Licensed under GPLv2 only. * Licensed under GPLv2 only.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9263 family SoC"; model = "Atmel AT91SAM9263 family SoC";
compatible = "atmel,at91sam9263"; compatible = "atmel,at91sam9263";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -45,6 +46,7 @@ cpu { ...@@ -45,6 +46,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x08000000>; reg = <0x20000000 0x08000000>;
}; };
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
...@@ -17,6 +16,8 @@ ...@@ -17,6 +16,8 @@
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9G45 family SoC"; model = "Atmel AT91SAM9G45 family SoC";
compatible = "atmel,at91sam9g45"; compatible = "atmel,at91sam9g45";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -51,6 +52,7 @@ cpu { ...@@ -51,6 +52,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x70000000 0x10000000>; reg = <0x70000000 0x10000000>;
}; };
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
...@@ -15,6 +14,8 @@ ...@@ -15,6 +14,8 @@
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9N12 SoC"; model = "Atmel AT91SAM9N12 SoC";
compatible = "atmel,at91sam9n12"; compatible = "atmel,at91sam9n12";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -47,6 +48,7 @@ cpu { ...@@ -47,6 +48,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x10000000>; reg = <0x20000000 0x10000000>;
}; };
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
...@@ -15,6 +14,8 @@ ...@@ -15,6 +14,8 @@
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9RL family SoC"; model = "Atmel AT91SAM9RL family SoC";
compatible = "atmel,at91sam9rl", "atmel,at91sam9"; compatible = "atmel,at91sam9rl", "atmel,at91sam9";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -48,6 +49,7 @@ cpu { ...@@ -48,6 +49,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x04000000>; reg = <0x20000000 0x04000000>;
}; };
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
...@@ -17,6 +16,8 @@ ...@@ -17,6 +16,8 @@
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel AT91SAM9x5 family SoC"; model = "Atmel AT91SAM9x5 family SoC";
compatible = "atmel,at91sam9x5"; compatible = "atmel,at91sam9x5";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -49,6 +50,7 @@ cpu { ...@@ -49,6 +50,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x10000000>; reg = <0x20000000 0x10000000>;
}; };
......
...@@ -15,6 +15,7 @@ / { ...@@ -15,6 +15,7 @@ / {
compatible = "sirf,atlas6-cb", "sirf,atlas6"; compatible = "sirf,atlas6-cb", "sirf,atlas6";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.