Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 141 deletions
arch/arm/boot/dts/alphascale-asm9260.dtsi
View file @ abe60a3a
...@@ -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 {
......
arch/arm/boot/dts/alpine.dtsi
View file @ abe60a3a
...@@ -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>;
......
arch/arm/boot/dts/arm-realview-eb.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/arm-realview-pb1176.dts
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/arm-realview-pb11mp.dts
View file @ abe60a3a
...@@ -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
......
arch/arm/boot/dts/arm-realview-pbx.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/armada-38x.dtsi
View file @ abe60a3a
...@@ -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";
......
arch/arm/boot/dts/armada-39x.dtsi
View file @ abe60a3a
...@@ -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";
......
arch/arm/boot/dts/artpec6.dtsi
View file @ abe60a3a
...@@ -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>;
......
arch/arm/boot/dts/at91rm9200.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9260.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9261.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9rl.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/atlas6-evb.dts
View file @ abe60a3a
...@@ -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>;
}; };
......
arch/arm/boot/dts/atlas6.dtsi
View file @ abe60a3a
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "skeleton.dtsi"
/ { / {
compatible = "sirf,atlas6"; compatible = "sirf,atlas6";
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/atlas7.dtsi
View file @ abe60a3a
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "skeleton.dtsi"
/ { / {
compatible = "sirf,atlas7"; compatible = "sirf,atlas7";
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/axm55xx.dtsi
View file @ abe60a3a
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/lsi,axm5516-clks.h> #include <dt-bindings/clock/lsi,axm5516-clks.h>
#include "skeleton64.dtsi"
/ { / {
#address-cells = <2>;
#size-cells = <2>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases { aliases {
......
arch/arm/boot/dts/bcm-cygnus.dtsi
View file @ abe60a3a
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/clock/bcm-cygnus.h> #include <dt-bindings/clock/bcm-cygnus.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "brcm,cygnus"; compatible = "brcm,cygnus";
model = "Broadcom Cygnus SoC"; model = "Broadcom Cygnus SoC";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -45,6 +45,11 @@ aliases { ...@@ -45,6 +45,11 @@ aliases {
ethernet0 = &eth0; ethernet0 = &eth0;
}; };
memory {
device_type = "memory";
reg = <0 0>;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
arch/arm/boot/dts/bcm-nsp.dtsi
View file @ abe60a3a
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/clock/bcm-nsp.h> #include <dt-bindings/clock/bcm-nsp.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "brcm,nsp"; compatible = "brcm,nsp";
model = "Broadcom Northstar Plus SoC"; model = "Broadcom Northstar Plus SoC";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/bcm11351.dtsi
View file @ abe60a3a
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include "dt-bindings/clock/bcm281xx.h" #include "dt-bindings/clock/bcm281xx.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "BCM11351 SoC"; model = "BCM11351 SoC";
compatible = "brcm,bcm11351"; compatible = "brcm,bcm11351";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/bcm21664-garnet.dts
View file @ abe60a3a
...@@ -22,6 +22,7 @@ / { ...@@ -22,6 +22,7 @@ / {
compatible = "brcm,bcm21664-garnet", "brcm,bcm21664"; compatible = "brcm,bcm21664-garnet", "brcm,bcm21664";
memory { memory {
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/bcm21664.dtsi
View file @ abe60a3a
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include "dt-bindings/clock/bcm21664.h" #include "dt-bindings/clock/bcm21664.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "BCM21664 SoC"; model = "BCM21664 SoC";
compatible = "brcm,bcm21664"; compatible = "brcm,bcm21664";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/bcm23550-sparrow.dts
View file @ abe60a3a
...@@ -46,6 +46,7 @@ chosen { ...@@ -46,6 +46,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
}; };
......
arch/arm/boot/dts/bcm23550.dtsi
View file @ abe60a3a
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
/* BCM23550 and BCM21664 have almost identical clocks */ /* BCM23550 and BCM21664 have almost identical clocks */
#include "dt-bindings/clock/bcm21664.h" #include "dt-bindings/clock/bcm21664.h"
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "BCM23550 SoC"; model = "BCM23550 SoC";
compatible = "brcm,bcm23550"; compatible = "brcm,bcm23550";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/bcm28155-ap.dts
View file @ abe60a3a
...@@ -22,6 +22,7 @@ / { ...@@ -22,6 +22,7 @@ / {
compatible = "brcm,bcm28155-ap", "brcm,bcm11351"; compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
memory { memory {
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
View file @ abe60a3a
...@@ -20,6 +20,7 @@ chosen { ...@@ -20,6 +20,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
View file @ abe60a3a
...@@ -20,6 +20,7 @@ chosen { ...@@ -20,6 +20,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
View file @ abe60a3a
...@@ -20,6 +20,7 @@ chosen { ...@@ -20,6 +20,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
View file @ abe60a3a
...@@ -16,6 +16,7 @@ chosen { ...@@ -16,6 +16,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
View file @ abe60a3a
...@@ -16,6 +16,7 @@ chosen { ...@@ -16,6 +16,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
View file @ abe60a3a
...@@ -20,6 +20,7 @@ chosen { ...@@ -20,6 +20,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47094-linksys-panamera.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x18000000>; 0x88000000 0x18000000>;
}; };
......
arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
View file @ abe60a3a
...@@ -16,6 +16,7 @@ chosen { ...@@ -16,6 +16,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x18000000>; 0x88000000 0x18000000>;
}; };
......
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x08000000>; 0x88000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x18000000>; 0x88000000 0x18000000>;
}; };
......
arch/arm/boot/dts/bcm47094-netgear-r8500.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x18000000>; 0x88000000 0x18000000>;
}; };
......
arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm47189-tenda-ac9.dts
View file @ abe60a3a
...@@ -16,6 +16,7 @@ chosen { ...@@ -16,6 +16,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm5301x.dtsi
View file @ abe60a3a
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
chipcommonA { chipcommonA {
......
arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts
View file @ abe60a3a
...@@ -20,6 +20,7 @@ chosen { ...@@ -20,6 +20,7 @@ chosen {
}; };
memory@0 { memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000>, reg = <0x00000000 0x08000000>,
<0x68000000 0x08000000>; <0x68000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm53573.dtsi
View file @ abe60a3a
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases { aliases {
......
arch/arm/boot/dts/bcm63138.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
#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>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "brcm,bcm63138"; compatible = "brcm,bcm63138";
model = "Broadcom BCM63138 DSL SoC"; model = "Broadcom BCM63138 DSL SoC";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
arch/arm/boot/dts/bcm7445.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
......
arch/arm/boot/dts/bcm947189acdbmr.dts
View file @ abe60a3a
...@@ -18,6 +18,7 @@ chosen { ...@@ -18,6 +18,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/bcm953012er.dts
View file @ abe60a3a
...@@ -40,6 +40,7 @@ / { ...@@ -40,6 +40,7 @@ / {
compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708"; compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
......
arch/arm/boot/dts/bcm953012hr.dts
View file @ abe60a3a
...@@ -46,6 +46,7 @@ aliases { ...@@ -46,6 +46,7 @@ aliases {
}; };
memory@80000000 { memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x10000000>; reg = <0x80000000 0x10000000>;
}; };
}; };
......
arch/arm/boot/dts/bcm953012k.dts
View file @ abe60a3a
...@@ -44,6 +44,7 @@ aliases { ...@@ -44,6 +44,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
reg = <0x80000000 0x10000000>; reg = <0x80000000 0x10000000>;
}; };
}; };
......
arch/arm/boot/dts/cx92755.dtsi
View file @ abe60a3a
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "cnxt,cx92755"; compatible = "cnxt,cx92755";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/dove.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/include/ "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.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>;
compatible = "marvell,dove"; compatible = "marvell,dove";
model = "Marvell Armada 88AP510 SoC"; model = "Marvell Armada 88AP510 SoC";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/ep7209.dtsi
View file @ abe60a3a
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
/dts-v1/; /dts-v1/;
#include "skeleton.dtsi"
#include <dt-bindings/clock/clps711x-clock.h> #include <dt-bindings/clock/clps711x-clock.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Cirrus Logic EP7209"; model = "Cirrus Logic EP7209";
compatible = "cirrus,ep7209"; compatible = "cirrus,ep7209";
......
arch/arm/boot/dts/ep7211-edb7211.dts
View file @ abe60a3a
...@@ -12,6 +12,7 @@ / { ...@@ -12,6 +12,7 @@ / {
compatible = "cirrus,edb7211", "cirrus,ep7211", "cirrus,ep7209"; compatible = "cirrus,edb7211", "cirrus,ep7211", "cirrus,ep7209";
memory { memory {
device_type = "memory";
reg = <0xc0000000 0x02000000>; reg = <0xc0000000 0x02000000>;
}; };
......
arch/arm/boot/dts/integrator.dtsi
View file @ abe60a3a
...@@ -3,9 +3,15 @@ ...@@ -3,9 +3,15 @@
* SoC core Device Tree for the ARM Integrator platforms * SoC core Device Tree for the ARM Integrator platforms
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
core-module@10000000 { core-module@10000000 {
compatible = "arm,core-module-integrator", "syscon", "simple-mfd"; compatible = "arm,core-module-integrator", "syscon", "simple-mfd";
reg = <0x10000000 0x200>; reg = <0x10000000 0x200>;
......
arch/arm/boot/dts/kirkwood.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/include/ "skeleton.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.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>;
compatible = "marvell,kirkwood"; compatible = "marvell,kirkwood";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/lpc32xx.dtsi
View file @ abe60a3a
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/lpc32xx-clock.h> #include <dt-bindings/clock/lpc32xx-clock.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "nxp,lpc3220"; compatible = "nxp,lpc3220";
interrupt-parent = <&mic>; interrupt-parent = <&mic>;
......
arch/arm/boot/dts/ls1021a.dtsi
View file @ abe60a3a
...@@ -45,11 +45,12 @@ ...@@ -45,11 +45,12 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton64.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/thermal/thermal.h>
/ { / {
#address-cells = <2>;
#size-cells = <2>;
compatible = "fsl,ls1021a"; compatible = "fsl,ls1021a";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -88,6 +89,11 @@ cpu1: cpu@f01 { ...@@ -88,6 +89,11 @@ cpu1: cpu@f01 {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0 0x0 0x0>;
};
sysclk: sysclk { sysclk: sysclk {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
......
arch/arm/boot/dts/meson.dtsi
View file @ abe60a3a
...@@ -47,9 +47,10 @@ ...@@ -47,9 +47,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
L2: l2-cache-controller@c4200000 { L2: l2-cache-controller@c4200000 {
......
arch/arm/boot/dts/meson6-atv1200.dts
View file @ abe60a3a
...@@ -61,6 +61,7 @@ chosen { ...@@ -61,6 +61,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
}; };
......
arch/arm/boot/dts/meson8-minix-neo-x8.dts
View file @ abe60a3a
...@@ -57,6 +57,7 @@ chosen { ...@@ -57,6 +57,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
arch/arm/boot/dts/meson8b-ec100.dts
View file @ abe60a3a
...@@ -23,6 +23,7 @@ chosen { ...@@ -23,6 +23,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
......
arch/arm/boot/dts/meson8b-mxq.dts
View file @ abe60a3a
...@@ -60,6 +60,7 @@ chosen { ...@@ -60,6 +60,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
}; };
......
arch/arm/boot/dts/meson8b-odroidc1.dts
View file @ abe60a3a
...@@ -62,6 +62,7 @@ chosen { ...@@ -62,6 +62,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
......
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
View file @ abe60a3a
...@@ -28,6 +28,7 @@ chosen { ...@@ -28,6 +28,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
......
arch/arm/boot/dts/mmp2-brownstone.dts
View file @ abe60a3a
...@@ -19,6 +19,7 @@ chosen { ...@@ -19,6 +19,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
......
arch/arm/boot/dts/mmp2.dtsi
View file @ abe60a3a
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
* publishhed by the Free Software Foundation. * publishhed by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/marvell,mmp2.h> #include <dt-bindings/clock/marvell,mmp2.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
serial1 = &uart2; serial1 = &uart2;
......
arch/arm/boot/dts/moxart.dtsi
View file @ abe60a3a
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "moxa,moxart"; compatible = "moxa,moxart";
model = "MOXART"; model = "MOXART";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/mt2701-evb.dts
View file @ abe60a3a
...@@ -13,6 +13,7 @@ / { ...@@ -13,6 +13,7 @@ / {
compatible = "mediatek,mt2701-evb", "mediatek,mt2701"; compatible = "mediatek,mt2701-evb", "mediatek,mt2701";
memory { memory {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
......
arch/arm/boot/dts/mt2701.dtsi
View file @ abe60a3a
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/memory/mt2701-larb-port.h> #include <dt-bindings/memory/mt2701-larb-port.h>
#include <dt-bindings/reset/mt2701-resets.h> #include <dt-bindings/reset/mt2701-resets.h>
#include "skeleton64.dtsi"
#include "mt2701-pinfunc.h" #include "mt2701-pinfunc.h"
/ { / {
#address-cells = <2>;
#size-cells = <2>;
compatible = "mediatek,mt2701"; compatible = "mediatek,mt2701";
interrupt-parent = <&cirq>; interrupt-parent = <&cirq>;
......
arch/arm/boot/dts/mt6580-evbp1.dts
View file @ abe60a3a
...@@ -22,6 +22,7 @@ chosen { ...@@ -22,6 +22,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x80000000 0x20000000>; reg = <0x80000000 0x20000000>;
}; };
}; };
......
arch/arm/boot/dts/mt6580.dtsi
View file @ abe60a3a
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
compatible = "mediatek,mt6580"; compatible = "mediatek,mt6580";
......
arch/arm/boot/dts/mt6589-aquaris5.dts
View file @ abe60a3a
...@@ -18,6 +18,7 @@ chosen { ...@@ -18,6 +18,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
......
arch/arm/boot/dts/mt6589.dtsi
View file @ abe60a3a
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "mediatek,mt6589"; compatible = "mediatek,mt6589";
interrupt-parent = <&sysirq>; interrupt-parent = <&sysirq>;
......
arch/arm/boot/dts/mt6592-evb.dts
View file @ abe60a3a
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
compatible = "mediatek,mt6592-evb", "mediatek,mt6592"; compatible = "mediatek,mt6592-evb", "mediatek,mt6592";
memory { memory {
device_type = "memory";
reg = <0x80000000 0x40000000>; reg = <0x80000000 0x40000000>;
}; };
}; };
arch/arm/boot/dts/mt6592.dtsi
View file @ abe60a3a
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "mediatek,mt6592"; compatible = "mediatek,mt6592";
interrupt-parent = <&sysirq>; interrupt-parent = <&sysirq>;
......
arch/arm/boot/dts/mt8127-moose.dts
View file @ abe60a3a
...@@ -13,6 +13,7 @@ / { ...@@ -13,6 +13,7 @@ / {
compatible = "mediatek,mt8127-moose", "mediatek,mt8127"; compatible = "mediatek,mt8127-moose", "mediatek,mt8127";
memory { memory {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
}; };
......
arch/arm/boot/dts/mt8127.dtsi
View file @ abe60a3a
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#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>;
compatible = "mediatek,mt8127"; compatible = "mediatek,mt8127";
interrupt-parent = <&sysirq>; interrupt-parent = <&sysirq>;
......
arch/arm/boot/dts/mt8135-evbp1.dts
View file @ abe60a3a
...@@ -13,6 +13,7 @@ / { ...@@ -13,6 +13,7 @@ / {
compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135"; compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";
memory { memory {
device_type = "memory";
reg = <0 0x80000000 0 0x40000000>; reg = <0 0x80000000 0 0x40000000>;
}; };
}; };
......
arch/arm/boot/dts/mt8135.dtsi
View file @ abe60a3a
...@@ -9,10 +9,11 @@ ...@@ -9,10 +9,11 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/mt8135-resets.h> #include <dt-bindings/reset/mt8135-resets.h>
#include "skeleton64.dtsi"
#include "mt8135-pinfunc.h" #include "mt8135-pinfunc.h"
/ { / {
#address-cells = <2>;
#size-cells = <2>;
compatible = "mediatek,mt8135"; compatible = "mediatek,mt8135";
interrupt-parent = <&sysirq>; interrupt-parent = <&sysirq>;
......
arch/arm/boot/dts/nspire.dtsi
View file @ abe60a3a
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
* *
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
cpus { cpus {
......
arch/arm/boot/dts/orion5x-lacie-d2-network.dts
View file @ abe60a3a
...@@ -19,6 +19,7 @@ / { ...@@ -19,6 +19,7 @@ / {
compatible = "lacie,d2-network", "marvell,orion5x-88f5182", "marvell,orion5x"; compatible = "lacie,d2-network", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x4000000>; /* 64 MB */ reg = <0x00000000 0x4000000>; /* 64 MB */
}; };
......
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
View file @ abe60a3a
...@@ -25,6 +25,7 @@ / { ...@@ -25,6 +25,7 @@ / {
compatible = "lacie,ethernet-disk-mini-v2", "marvell,orion5x-88f5182", "marvell,orion5x"; compatible = "lacie,ethernet-disk-mini-v2", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x4000000>; /* 64 MB */ reg = <0x00000000 0x4000000>; /* 64 MB */
}; };
......
arch/arm/boot/dts/orion5x-lswsgl.dts
View file @ abe60a3a
...@@ -55,6 +55,7 @@ / { ...@@ -55,6 +55,7 @@ / {
compatible = "buffalo,lswsgl", "marvell,orion5x-88f5182", "marvell,orion5x"; compatible = "buffalo,lswsgl", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x8000000>; /* 128 MB */ reg = <0x00000000 0x8000000>; /* 128 MB */
}; };
......
arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
View file @ abe60a3a
...@@ -19,6 +19,7 @@ / { ...@@ -19,6 +19,7 @@ / {
compatible = "maxtor,shared-storage-2", "marvell,orion5x-88f5182", "marvell,orion5x"; compatible = "maxtor,shared-storage-2", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x4000000>; /* 64 MB */ reg = <0x00000000 0x4000000>; /* 64 MB */
}; };
......
arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
View file @ abe60a3a
...@@ -21,6 +21,7 @@ aliases { ...@@ -21,6 +21,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x2000000>; /* 32 MB */ reg = <0x00000000 0x2000000>; /* 32 MB */
}; };
......
arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
View file @ abe60a3a
...@@ -16,6 +16,7 @@ / { ...@@ -16,6 +16,7 @@ / {
compatible = "marvell,rd-88f5182-nas", "marvell,orion5x-88f5182", "marvell,orion5x"; compatible = "marvell,rd-88f5182-nas", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x4000000>; /* 64 MB */ reg = <0x00000000 0x4000000>; /* 64 MB */
}; };
......
arch/arm/boot/dts/orion5x.dtsi
View file @ abe60a3a
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include "skeleton.dtsi"
#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 Orion5x SoC"; model = "Marvell Orion5x SoC";
compatible = "marvell,orion5x"; compatible = "marvell,orion5x";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/ox810se.dtsi
View file @ abe60a3a
...@@ -6,11 +6,12 @@ ...@@ -6,11 +6,12 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
#include <dt-bindings/clock/oxsemi,ox810se.h> #include <dt-bindings/clock/oxsemi,ox810se.h>
#include <dt-bindings/reset/oxsemi,ox810se.h> #include <dt-bindings/reset/oxsemi,ox810se.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "oxsemi,ox810se"; compatible = "oxsemi,ox810se";
cpus { cpus {
...@@ -25,6 +26,7 @@ cpu { ...@@ -25,6 +26,7 @@ cpu {
}; };
memory { memory {
device_type = "memory";
/* Max 256MB @ 0x48000000 */ /* Max 256MB @ 0x48000000 */
reg = <0x48000000 0x10000000>; reg = <0x48000000 0x10000000>;
}; };
......
arch/arm/boot/dts/ox820.dtsi
View file @ abe60a3a
...@@ -6,12 +6,13 @@ ...@@ -6,12 +6,13 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/oxsemi,ox820.h> #include <dt-bindings/clock/oxsemi,ox820.h>
#include <dt-bindings/reset/oxsemi,ox820.h> #include <dt-bindings/reset/oxsemi,ox820.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "oxsemi,ox820"; compatible = "oxsemi,ox820";
cpus { cpus {
...@@ -35,6 +36,7 @@ cpu@1 { ...@@ -35,6 +36,7 @@ cpu@1 {
}; };
memory { memory {
device_type = "memory";
/* Max 512MB @ 0x60000000 */ /* Max 512MB @ 0x60000000 */
reg = <0x60000000 0x20000000>; reg = <0x60000000 0x20000000>;
}; };
......
arch/arm/boot/dts/picoxcell-pc3x2.dtsi
View file @ abe60a3a
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
/include/ "skeleton.dtsi"
/ { / {
model = "Picochip picoXcell PC3X2"; model = "Picochip picoXcell PC3X2";
compatible = "picochip,pc3x2"; compatible = "picochip,pc3x2";
......
arch/arm/boot/dts/picoxcell-pc3x3.dtsi
View file @ abe60a3a
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
/include/ "skeleton.dtsi"
/ { / {
model = "Picochip picoXcell PC3X3"; model = "Picochip picoXcell PC3X3";
compatible = "picochip,pc3x3"; compatible = "picochip,pc3x3";
......
arch/arm/boot/dts/prima2-evb.dts
View file @ abe60a3a
...@@ -15,6 +15,7 @@ / { ...@@ -15,6 +15,7 @@ / {
compatible = "sirf,prima2", "sirf,prima2-cb"; compatible = "sirf,prima2", "sirf,prima2-cb";
memory { memory {
device_type = "memory";
reg = <0x00000000 0x20000000>; reg = <0x00000000 0x20000000>;
}; };
......
arch/arm/boot/dts/prima2.dtsi
View file @ abe60a3a
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
/include/ "skeleton.dtsi"
/ { / {
compatible = "sirf,prima2"; compatible = "sirf,prima2";
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/pxa168.dtsi
View file @ abe60a3a
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
* publishhed by the Free Software Foundation. * publishhed by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/marvell,pxa168.h> #include <dt-bindings/clock/marvell,pxa168.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
serial1 = &uart2; serial1 = &uart2;
......
arch/arm/boot/dts/pxa2xx.dtsi
View file @ abe60a3a
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
* Licensed under GPLv2 or later. * Licensed under GPLv2 or later.
*/ */
#include "skeleton.dtsi"
#include "dt-bindings/clock/pxa-clock.h" #include "dt-bindings/clock/pxa-clock.h"
#define PMGROUP(pin) #pin #define PMGROUP(pin) #pin
...@@ -29,6 +28,8 @@ mux- ## func { \ ...@@ -29,6 +28,8 @@ mux- ## func { \
} }
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Marvell PXA2xx family SoC"; model = "Marvell PXA2xx family SoC";
compatible = "marvell,pxa2xx"; compatible = "marvell,pxa2xx";
interrupt-parent = <&pxairq>; interrupt-parent = <&pxairq>;
......
arch/arm/boot/dts/pxa910.dtsi
View file @ abe60a3a
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
* publishhed by the Free Software Foundation. * publishhed by the Free Software Foundation.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/marvell,pxa910.h> #include <dt-bindings/clock/marvell,pxa910.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
serial1 = &uart2; serial1 = &uart2;
......
arch/arm/boot/dts/qcom-apq8064.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
#include "skeleton.dtsi"
#include <dt-bindings/clock/qcom,gcc-msm8960.h> #include <dt-bindings/clock/qcom,gcc-msm8960.h>
#include <dt-bindings/reset/qcom,gcc-msm8960.h> #include <dt-bindings/reset/qcom,gcc-msm8960.h>
#include <dt-bindings/clock/qcom,mmcc-msm8960.h> #include <dt-bindings/clock/qcom,mmcc-msm8960.h>
...@@ -10,6 +9,8 @@ ...@@ -10,6 +9,8 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm APQ8064"; model = "Qualcomm APQ8064";
compatible = "qcom,apq8064"; compatible = "qcom,apq8064";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -94,6 +95,11 @@ CPU_SPC: spc { ...@@ -94,6 +95,11 @@ CPU_SPC: spc {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
thermal-zones { thermal-zones {
cpu-thermal0 { cpu-thermal0 {
polling-delay-passive = <250>; polling-delay-passive = <250>;
......
arch/arm/boot/dts/qcom-apq8084.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
#include "skeleton.dtsi"
#include <dt-bindings/clock/qcom,gcc-apq8084.h> #include <dt-bindings/clock/qcom,gcc-apq8084.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm APQ 8084"; model = "Qualcomm APQ 8084";
compatible = "qcom,apq8084"; compatible = "qcom,apq8084";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -87,6 +87,11 @@ CPU_SPC: spc { ...@@ -87,6 +87,11 @@ CPU_SPC: spc {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
firmware { firmware {
scm { scm {
compatible = "qcom,scm"; compatible = "qcom,scm";
......
arch/arm/boot/dts/qcom-ipq4019.dtsi
View file @ abe60a3a
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
/dts-v1/; /dts-v1/;
#include "skeleton.dtsi"
#include <dt-bindings/clock/qcom,gcc-ipq4019.h> #include <dt-bindings/clock/qcom,gcc-ipq4019.h>
#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>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm Technologies, Inc. IPQ4019"; model = "Qualcomm Technologies, Inc. IPQ4019";
compatible = "qcom,ipq4019"; compatible = "qcom,ipq4019";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -133,6 +134,11 @@ opp-716000000 { ...@@ -133,6 +134,11 @@ opp-716000000 {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
pmu { pmu {
compatible = "arm,cortex-a7-pmu"; compatible = "arm,cortex-a7-pmu";
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) | interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
......
arch/arm/boot/dts/qcom-ipq8064.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
#include "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-ipq806x.h> #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
#include <dt-bindings/clock/qcom,lcc-ipq806x.h> #include <dt-bindings/clock/qcom,lcc-ipq806x.h>
...@@ -11,6 +10,8 @@ ...@@ -11,6 +10,8 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm IPQ8064"; model = "Qualcomm IPQ8064";
compatible = "qcom,ipq8064"; compatible = "qcom,ipq8064";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -45,6 +46,11 @@ L2: l2-cache { ...@@ -45,6 +46,11 @@ L2: l2-cache {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
cpu-pmu { cpu-pmu {
compatible = "qcom,krait-pmu"; compatible = "qcom,krait-pmu";
interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
......
arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
View file @ abe60a3a
...@@ -50,6 +50,7 @@ / { ...@@ -50,6 +50,7 @@ / {
compatible = "swir,wp8548", "qcom,mdm9615"; compatible = "swir,wp8548", "qcom,mdm9615";
memory { memory {
device_type = "memory";
reg = <0x48000000 0x7F00000>; reg = <0x48000000 0x7F00000>;
}; };
}; };
......
arch/arm/boot/dts/qcom-mdm9615.dtsi
View file @ abe60a3a
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-mdm9615.h> #include <dt-bindings/clock/qcom,gcc-mdm9615.h>
#include <dt-bindings/reset/qcom,gcc-mdm9615.h> #include <dt-bindings/reset/qcom,gcc-mdm9615.h>
...@@ -54,6 +52,8 @@ ...@@ -54,6 +52,8 @@
#include <dt-bindings/soc/qcom,gsbi.h> #include <dt-bindings/soc/qcom,gsbi.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm MDM9615"; model = "Qualcomm MDM9615";
compatible = "qcom,mdm9615"; compatible = "qcom,mdm9615";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
......
arch/arm/boot/dts/qcom-msm8660.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-msm8660.h> #include <dt-bindings/clock/qcom,gcc-msm8660.h>
#include <dt-bindings/soc/qcom,gsbi.h> #include <dt-bindings/soc/qcom,gsbi.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm MSM8660"; model = "Qualcomm MSM8660";
compatible = "qcom,msm8660"; compatible = "qcom,msm8660";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -39,6 +39,11 @@ L2: l2-cache { ...@@ -39,6 +39,11 @@ L2: l2-cache {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
cpu-pmu { cpu-pmu {
compatible = "qcom,scorpion-mp-pmu"; compatible = "qcom,scorpion-mp-pmu";
interrupts = <1 9 0x304>; interrupts = <1 9 0x304>;
......
arch/arm/boot/dts/qcom-msm8960.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-msm8960.h> #include <dt-bindings/clock/qcom,gcc-msm8960.h>
#include <dt-bindings/mfd/qcom-rpm.h> #include <dt-bindings/mfd/qcom-rpm.h>
#include <dt-bindings/soc/qcom,gsbi.h> #include <dt-bindings/soc/qcom,gsbi.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm MSM8960"; model = "Qualcomm MSM8960";
compatible = "qcom,msm8960"; compatible = "qcom,msm8960";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -44,6 +44,11 @@ L2: l2-cache { ...@@ -44,6 +44,11 @@ L2: l2-cache {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
cpu-pmu { cpu-pmu {
compatible = "qcom,krait-pmu"; compatible = "qcom,krait-pmu";
interrupts = <1 10 0x304>; interrupts = <1 10 0x304>;
......
arch/arm/boot/dts/qcom-msm8974.dtsi
View file @ abe60a3a
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
#include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/reset/qcom,gcc-msm8974.h> #include <dt-bindings/reset/qcom,gcc-msm8974.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Qualcomm MSM8974"; model = "Qualcomm MSM8974";
compatible = "qcom,msm8974"; compatible = "qcom,msm8974";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
...@@ -130,6 +131,11 @@ CPU_SPC: spc { ...@@ -130,6 +131,11 @@ CPU_SPC: spc {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
thermal-zones { thermal-zones {
cpu-thermal0 { cpu-thermal0 {
polling-delay-passive = <250>; polling-delay-passive = <250>;
......
arch/arm/boot/dts/sama5d2.dtsi
View file @ abe60a3a
...@@ -43,13 +43,14 @@ ...@@ -43,13 +43,14 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
#include <dt-bindings/iio/adc/at91-sama5d2_adc.h> #include <dt-bindings/iio/adc/at91-sama5d2_adc.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel SAMA5D2 family SoC"; model = "Atmel SAMA5D2 family SoC";
compatible = "atmel,sama5d2"; compatible = "atmel,sama5d2";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -113,6 +114,7 @@ etm_out: endpoint { ...@@ -113,6 +114,7 @@ etm_out: endpoint {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x20000000>; reg = <0x20000000 0x20000000>;
}; };
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ abe60a3a
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,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>
...@@ -16,6 +15,8 @@ ...@@ -16,6 +15,8 @@
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel SAMA5D3 family SoC"; model = "Atmel SAMA5D3 family SoC";
compatible = "atmel,sama5d3", "atmel,sama5"; compatible = "atmel,sama5d3", "atmel,sama5";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -56,6 +57,7 @@ pmu { ...@@ -56,6 +57,7 @@ pmu {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x8000000>; reg = <0x20000000 0x8000000>;
}; };
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ abe60a3a
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include <dt-bindings/clock/at91.h> #include <dt-bindings/clock/at91.h>
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/pinctrl/at91.h>
...@@ -51,6 +50,8 @@ ...@@ -51,6 +50,8 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
model = "Atmel SAMA5D4 family SoC"; model = "Atmel SAMA5D4 family SoC";
compatible = "atmel,sama5d4"; compatible = "atmel,sama5d4";
interrupt-parent = <&aic>; interrupt-parent = <&aic>;
...@@ -90,6 +91,7 @@ cpu@0 { ...@@ -90,6 +91,7 @@ cpu@0 {
}; };
memory { memory {
device_type = "memory";
reg = <0x20000000 0x20000000>; reg = <0x20000000 0x20000000>;
}; };
......
arch/arm/boot/dts/skeleton.dtsi deleted 100644 → 0
View file @ 6569df3d
// SPDX-License-Identifier: GPL-2.0
/*
* This file is deprecated, and will be removed once existing users have been
* updated. New dts{,i} files should *not* include skeleton.dtsi, and should
* instead explicitly provide the below nodes only as required.
*
* Skeleton device tree; the bare minimum needed to boot; just include and
* add a compatible value. The bootloader will typically populate the memory
* node.
*/
/ {
#address-cells = <1>;
#size-cells = <1>;
chosen { };
aliases { };
memory { device_type = "memory"; reg = <0 0>; };
};
arch/arm/boot/dts/skeleton64.dtsi deleted 100644 → 0
View file @ 6569df3d
// SPDX-License-Identifier: GPL-2.0
/*
* Skeleton device tree in the 64 bits version; the bare minimum
* needed to boot; just include and add a compatible value. The
* bootloader will typically populate the memory node.
*/
/ {
#address-cells = <2>;
#size-cells = <2>;
chosen { };
aliases { };
memory { device_type = "memory"; reg = <0 0 0 0>; };
};
arch/arm/boot/dts/spear13xx.dtsi
View file @ abe60a3a
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
cpus { cpus {
......
arch/arm/boot/dts/spear3xx.dtsi
View file @ abe60a3a
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
interrupt-parent = <&vic>; interrupt-parent = <&vic>;
cpus { cpus {
......
arch/arm/boot/dts/spear600.dtsi
View file @ abe60a3a
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,spear600"; compatible = "st,spear600";
cpus { cpus {
......
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View file @ abe60a3a
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
*/ */
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory {
device_type = "memory";
reg = <0x00000000 0x04000000>, reg = <0x00000000 0x04000000>,
<0x08000000 0x04000000>; <0x08000000 0x04000000>;
}; };
......
arch/arm/boot/dts/ste-u300.dts
View file @ abe60a3a
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi"
/ { / {
model = "ST-Ericsson U300"; model = "ST-Ericsson U300";
...@@ -22,6 +21,7 @@ aliases { ...@@ -22,6 +21,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
reg = <0x48000000 0x03c00000>; reg = <0x48000000 0x03c00000>;
}; };
......
arch/arm/boot/dts/stm32429i-eval.dts
View file @ abe60a3a
...@@ -61,6 +61,7 @@ chosen { ...@@ -61,6 +61,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x2000000>; reg = <0x00000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32746g-eval.dts
View file @ abe60a3a
...@@ -55,6 +55,7 @@ chosen { ...@@ -55,6 +55,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0xc0000000 0x2000000>; reg = <0xc0000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32f429-disco.dts
View file @ abe60a3a
...@@ -60,6 +60,7 @@ chosen { ...@@ -60,6 +60,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x90000000 0x800000>; reg = <0x90000000 0x800000>;
}; };
......
arch/arm/boot/dts/stm32f429.dtsi
View file @ abe60a3a
...@@ -45,12 +45,14 @@ ...@@ -45,12 +45,14 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include "armv7-m.dtsi" #include "armv7-m.dtsi"
#include <dt-bindings/clock/stm32fx-clock.h> #include <dt-bindings/clock/stm32fx-clock.h>
#include <dt-bindings/mfd/stm32f4-rcc.h> #include <dt-bindings/mfd/stm32f4-rcc.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
clocks { clocks {
clk_hse: clk-hse { clk_hse: clk-hse {
#clock-cells = <0>; #clock-cells = <0>;
......
arch/arm/boot/dts/stm32f469-disco.dts
View file @ abe60a3a
...@@ -61,6 +61,7 @@ chosen { ...@@ -61,6 +61,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x1000000>; reg = <0x00000000 0x1000000>;
}; };
......
arch/arm/boot/dts/stm32f746-disco.dts
View file @ abe60a3a
...@@ -56,6 +56,7 @@ chosen { ...@@ -56,6 +56,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0xC0000000 0x800000>; reg = <0xC0000000 0x800000>;
}; };
......
arch/arm/boot/dts/stm32f746.dtsi
View file @ abe60a3a
...@@ -40,12 +40,14 @@ ...@@ -40,12 +40,14 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include "armv7-m.dtsi" #include "armv7-m.dtsi"
#include <dt-bindings/clock/stm32fx-clock.h> #include <dt-bindings/clock/stm32fx-clock.h>
#include <dt-bindings/mfd/stm32f7-rcc.h> #include <dt-bindings/mfd/stm32f7-rcc.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
clocks { clocks {
clk_hse: clk-hse { clk_hse: clk-hse {
#clock-cells = <0>; #clock-cells = <0>;
......
arch/arm/boot/dts/stm32f769-disco.dts
View file @ abe60a3a
...@@ -56,6 +56,7 @@ chosen { ...@@ -56,6 +56,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0xC0000000 0x1000000>; reg = <0xC0000000 0x1000000>;
}; };
......
arch/arm/boot/dts/stm32h743.dtsi
View file @ abe60a3a
...@@ -40,13 +40,15 @@ ...@@ -40,13 +40,15 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include "skeleton.dtsi"
#include "armv7-m.dtsi" #include "armv7-m.dtsi"
#include <dt-bindings/clock/stm32h7-clks.h> #include <dt-bindings/clock/stm32h7-clks.h>
#include <dt-bindings/mfd/stm32h7-rcc.h> #include <dt-bindings/mfd/stm32h7-rcc.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
clocks { clocks {
clk_hse: clk-hse { clk_hse: clk-hse {
#clock-cells = <0>; #clock-cells = <0>;
......
arch/arm/boot/dts/stm32h743i-disco.dts
View file @ abe60a3a
...@@ -54,6 +54,7 @@ chosen { ...@@ -54,6 +54,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0xd0000000 0x2000000>; reg = <0xd0000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32h743i-eval.dts
View file @ abe60a3a
...@@ -54,6 +54,7 @@ chosen { ...@@ -54,6 +54,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0xd0000000 0x2000000>; reg = <0xd0000000 0x2000000>;
}; };
......
arch/arm/boot/dts/stm32mp157c-ed1.dts
View file @ abe60a3a
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory@c0000000 { memory@c0000000 {
device_type = "memory";
reg = <0xC0000000 0x40000000>; reg = <0xC0000000 0x40000000>;
}; };
......
arch/arm/boot/dts/versatile-ab.dts
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/dts-v1/; /dts-v1/;
/include/ "skeleton.dtsi"
/ { / {
model = "ARM Versatile AB"; model = "ARM Versatile AB";
...@@ -21,6 +20,7 @@ chosen { ...@@ -21,6 +20,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x0 0x08000000>; reg = <0x0 0x08000000>;
}; };
......
arch/arm/boot/dts/vt8500.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "via,vt8500"; compatible = "via,vt8500";
cpus { cpus {
...@@ -21,6 +21,11 @@ cpu { ...@@ -21,6 +21,11 @@ cpu {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
......
arch/arm/boot/dts/wm8505.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "wm,wm8505"; compatible = "wm,wm8505";
cpus { cpus {
...@@ -21,6 +21,11 @@ cpu { ...@@ -21,6 +21,11 @@ cpu {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
......
arch/arm/boot/dts/wm8650.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "wm,wm8650"; compatible = "wm,wm8650";
cpus { cpus {
...@@ -21,6 +21,11 @@ cpu { ...@@ -21,6 +21,11 @@ cpu {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
......
arch/arm/boot/dts/wm8750.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "wm,wm8750"; compatible = "wm,wm8750";
cpus { cpus {
...@@ -21,6 +21,11 @@ cpu { ...@@ -21,6 +21,11 @@ cpu {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
......
arch/arm/boot/dts/wm8850.dtsi
View file @ abe60a3a
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Licensed under GPLv2 or later * Licensed under GPLv2 or later
*/ */
/include/ "skeleton.dtsi"
/ { / {
#address-cells = <1>;
#size-cells = <1>;
compatible = "wm,wm8850"; compatible = "wm,wm8850";
cpus { cpus {
...@@ -22,6 +22,11 @@ cpu@0 { ...@@ -22,6 +22,11 @@ cpu@0 {
}; };
}; };
memory {
device_type = "memory";
reg = <0x0 0x0>;
};
aliases { aliases {
serial0 = &uart0; serial0 = &uart0;
serial1 = &uart1; serial1 = &uart1;
......
arch/arm/boot/dts/zx296702-ad1.dts
View file @ abe60a3a
...@@ -14,6 +14,7 @@ aliases { ...@@ -14,6 +14,7 @@ aliases {
}; };
memory { memory {
device_type = "memory";
reg = <0x50000000 0x20000000>; reg = <0x50000000 0x20000000>;
}; };
}; };
......
arch/arm/boot/dts/zx296702.dtsi
View file @ abe60a3a
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "skeleton.dtsi"
#include <dt-bindings/clock/zx296702-clock.h> #include <dt-bindings/clock/zx296702-clock.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
#address-cells = <1>;
#size-cells = <1>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7