ARM: dts: Kill off skeleton{64}.dtsi
authorRob Herring <robh@kernel.org>
Wed, 9 Jan 2019 16:26:14 +0000 (10:26 -0600)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Jan 2019 16:30:31 +0000 (17:30 +0100)
Remove the usage of skeleton.dtsi in the remaining dts files. It was
deprecated since commit 9c0da3cc61f1 ("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: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Antoine Tenart <antoine.tenart@bootlin.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Tested-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
141 files changed:
arch/arm/boot/dts/alphascale-asm9260.dtsi
arch/arm/boot/dts/alpine.dtsi
arch/arm/boot/dts/arm-realview-eb.dtsi
arch/arm/boot/dts/arm-realview-pb1176.dts
arch/arm/boot/dts/arm-realview-pb11mp.dts
arch/arm/boot/dts/arm-realview-pbx.dtsi
arch/arm/boot/dts/armada-38x.dtsi
arch/arm/boot/dts/armada-39x.dtsi
arch/arm/boot/dts/artpec6.dtsi
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9261.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9rl.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/atlas6-evb.dts
arch/arm/boot/dts/atlas6.dtsi
arch/arm/boot/dts/atlas7.dtsi
arch/arm/boot/dts/axm55xx.dtsi
arch/arm/boot/dts/bcm-cygnus.dtsi
arch/arm/boot/dts/bcm-nsp.dtsi
arch/arm/boot/dts/bcm11351.dtsi
arch/arm/boot/dts/bcm21664-garnet.dts
arch/arm/boot/dts/bcm21664.dtsi
arch/arm/boot/dts/bcm23550-sparrow.dts
arch/arm/boot/dts/bcm23550.dtsi
arch/arm/boot/dts/bcm28155-ap.dts
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
arch/arm/boot/dts/bcm47094-linksys-panamera.dts
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
arch/arm/boot/dts/bcm47094-netgear-r8500.dts
arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
arch/arm/boot/dts/bcm47189-tenda-ac9.dts
arch/arm/boot/dts/bcm5301x.dtsi
arch/arm/boot/dts/bcm53340-ubnt-unifi-switch8.dts
arch/arm/boot/dts/bcm53573.dtsi
arch/arm/boot/dts/bcm63138.dtsi
arch/arm/boot/dts/bcm7445.dtsi
arch/arm/boot/dts/bcm947189acdbmr.dts
arch/arm/boot/dts/bcm953012er.dts
arch/arm/boot/dts/bcm953012hr.dts
arch/arm/boot/dts/bcm953012k.dts
arch/arm/boot/dts/cx92755.dtsi
arch/arm/boot/dts/dove.dtsi
arch/arm/boot/dts/ep7209.dtsi
arch/arm/boot/dts/ep7211-edb7211.dts
arch/arm/boot/dts/integrator.dtsi
arch/arm/boot/dts/kirkwood.dtsi
arch/arm/boot/dts/lpc32xx.dtsi
arch/arm/boot/dts/ls1021a.dtsi
arch/arm/boot/dts/meson.dtsi
arch/arm/boot/dts/meson6-atv1200.dts
arch/arm/boot/dts/meson8-minix-neo-x8.dts
arch/arm/boot/dts/meson8b-ec100.dts
arch/arm/boot/dts/meson8b-mxq.dts
arch/arm/boot/dts/meson8b-odroidc1.dts
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
arch/arm/boot/dts/mmp2-brownstone.dts
arch/arm/boot/dts/mmp2.dtsi
arch/arm/boot/dts/moxart.dtsi
arch/arm/boot/dts/mt2701-evb.dts
arch/arm/boot/dts/mt2701.dtsi
arch/arm/boot/dts/mt6580-evbp1.dts
arch/arm/boot/dts/mt6580.dtsi
arch/arm/boot/dts/mt6589-aquaris5.dts
arch/arm/boot/dts/mt6589.dtsi
arch/arm/boot/dts/mt6592-evb.dts
arch/arm/boot/dts/mt6592.dtsi
arch/arm/boot/dts/mt8127-moose.dts
arch/arm/boot/dts/mt8127.dtsi
arch/arm/boot/dts/mt8135-evbp1.dts
arch/arm/boot/dts/mt8135.dtsi
arch/arm/boot/dts/nspire.dtsi
arch/arm/boot/dts/orion5x-lacie-d2-network.dts
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
arch/arm/boot/dts/orion5x-lswsgl.dts
arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
arch/arm/boot/dts/orion5x.dtsi
arch/arm/boot/dts/ox810se.dtsi
arch/arm/boot/dts/ox820.dtsi
arch/arm/boot/dts/picoxcell-pc3x2.dtsi
arch/arm/boot/dts/picoxcell-pc3x3.dtsi
arch/arm/boot/dts/prima2-evb.dts
arch/arm/boot/dts/prima2.dtsi
arch/arm/boot/dts/pxa168.dtsi
arch/arm/boot/dts/pxa2xx.dtsi
arch/arm/boot/dts/pxa910.dtsi
arch/arm/boot/dts/qcom-apq8064.dtsi
arch/arm/boot/dts/qcom-apq8084.dtsi
arch/arm/boot/dts/qcom-ipq4019.dtsi
arch/arm/boot/dts/qcom-ipq8064.dtsi
arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
arch/arm/boot/dts/qcom-mdm9615.dtsi
arch/arm/boot/dts/qcom-msm8660.dtsi
arch/arm/boot/dts/qcom-msm8960.dtsi
arch/arm/boot/dts/qcom-msm8974.dtsi
arch/arm/boot/dts/sama5d2.dtsi
arch/arm/boot/dts/sama5d3.dtsi
arch/arm/boot/dts/sama5d4.dtsi
arch/arm/boot/dts/skeleton.dtsi [deleted file]
arch/arm/boot/dts/skeleton64.dtsi [deleted file]
arch/arm/boot/dts/spear13xx.dtsi
arch/arm/boot/dts/spear3xx.dtsi
arch/arm/boot/dts/spear600.dtsi
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
arch/arm/boot/dts/ste-u300.dts
arch/arm/boot/dts/stm32429i-eval.dts
arch/arm/boot/dts/stm32746g-eval.dts
arch/arm/boot/dts/stm32f429-disco.dts
arch/arm/boot/dts/stm32f429.dtsi
arch/arm/boot/dts/stm32f469-disco.dts
arch/arm/boot/dts/stm32f746-disco.dts
arch/arm/boot/dts/stm32f746.dtsi
arch/arm/boot/dts/stm32f769-disco.dts
arch/arm/boot/dts/stm32h743.dtsi
arch/arm/boot/dts/stm32h743i-disco.dts
arch/arm/boot/dts/stm32h743i-eval.dts
arch/arm/boot/dts/stm32mp157c-ed1.dts
arch/arm/boot/dts/versatile-ab.dts
arch/arm/boot/dts/vt8500.dtsi
arch/arm/boot/dts/wm8505.dtsi
arch/arm/boot/dts/wm8650.dtsi
arch/arm/boot/dts/wm8750.dtsi
arch/arm/boot/dts/wm8850.dtsi
arch/arm/boot/dts/zx296702-ad1.dts
arch/arm/boot/dts/zx296702.dtsi

index 907fc7bfc418c94723a20dcd55c4ba1ffcb56e5e..2ce6038536fdaa7f74464e7d03f1a2a24f272ec8 100644 (file)
@@ -4,10 +4,11 @@
  * Licensed under the X11 license or the GPL v2 (or later)
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/alphascale,asm9260.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&icoll>;
 
        memory {
index 731df7a8c4e618ba1b7a37502515876180da82a8..d3036ea823d1a4c94d07177ba66d2eb21991140a 100644 (file)
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton64.dtsi"
 
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        /* SOC compatibility */
        compatible = "al,alpine";
 
+       memory {
+               device_type = "memory";
+               reg = <0 0 0 0>;
+       };
+
        /* CPU Configuration */
        cpus {
                #address-cells = <1>;
index 0e4c7c4c8c0930c81a6e8f1925a9cf0343a4b76e..610506723ea5de1c6e0458445085890726fe7ee7 100644 (file)
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "arm,realview-eb";
 
        chosen { };
@@ -38,6 +39,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* 128 MiB memory @ 0x0 */
                reg = <0x00000000 0x08000000>;
        };
index 83e0fbc4a1a10cf4e4b9418b9646d7f06aaea181..cbbb8878daa3a841d9247088c7c713d8bc169b29 100644 (file)
 /dts-v1/;
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "ARM RealView PB1176";
        compatible = "arm,realview-pb1176";
 
@@ -40,6 +41,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* 128 MiB memory @ 0x0 */
                reg = <0x00000000 0x08000000>;
        };
index 2f6aa24a0b67c707068bba9fb7902525ff1158c0..2015619ca22cdb90f673b3713f5012f1546a8340 100644 (file)
 /dts-v1/;
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "ARM RealView PB11MPcore";
        compatible = "arm,realview-pb11mp";
 
@@ -39,6 +40,7 @@
        };
 
        memory {
+               device_type = "memory";
                /*
                 * The PB11MPCore has 512 MiB memory @ 0x70000000
                 * and the first 256 are also remapped @ 0x00000000
index 916a97734f84cc7b72d7087d09e429020c8c957c..a81e9c28243219d80c0627e772efc197569da566 100644 (file)
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "arm,realview-pbx";
 
        chosen { };
@@ -39,6 +40,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* 128 MiB memory @ 0x0 */
                reg = <0x00000000 0x08000000>;
        };
index 929459c42760592c00d4ea0d585be4da2ad7e301..746887f7be5ad9c5bcb71cb9a997ebbb329fd254 100644 (file)
@@ -9,13 +9,15 @@
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        model = "Marvell Armada 38x family SoC";
        compatible = "marvell,armada380";
 
index f0c949831efb7e59617b0781314d0a581b370a91..b1b86934c688a24cbec25a6be4c96fa710d5055e 100644 (file)
@@ -7,13 +7,14 @@
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Marvell Armada 39x family SoC";
        compatible = "marvell,armada390";
 
index 3e4115c2cd7577288486720fb76251e23ac243ed..037157e6c5ee3a893e9f6d2344b8fd45aee61980 100644 (file)
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/dma/nbpfaxi.h>
 #include <dt-bindings/clock/axis,artpec6-clkctrl.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "axis,artpec6";
        interrupt-parent = <&intc>;
 
index 2ad69a7fbc007ed7d367b1665d6322cfdac1ae89..5a882a0538167f0da6748bd7a32b0c3a0abe5b1a 100644 (file)
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91RM9200 family SoC";
        compatible = "atmel,at91rm9200";
        interrupt-parent = <&aic>;
@@ -49,6 +50,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };
 
index 7cd9c3bc4dfbdb2f5c5395cd6c7cbb2aaa02ab28..3b58b94b53c91bc829655890339449a28bba9c3e 100644 (file)
@@ -8,13 +8,14 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9260 family SoC";
        compatible = "atmel,at91sam9260";
        interrupt-parent = <&aic>;
@@ -46,6 +47,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };
 
index 01d700b63b451e5ce4a10cd5e026130ea0c79795..a907a1fdd24cc6148f0381163abcbbc312b7e0a7 100644 (file)
@@ -6,13 +6,14 @@
  * Licensed under GPLv2 only.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9261 family SoC";
        compatible = "atmel,at91sam9261";
        interrupt-parent = <&aic>;
@@ -43,6 +44,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x08000000>;
        };
 
index c5766da4e54e4c6447e286860f1b31afa878f2e5..3fb63d81f18edbe023f1405fd25418d64f279ea6 100644 (file)
@@ -6,13 +6,14 @@
  * Licensed under GPLv2 only.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9263 family SoC";
        compatible = "atmel,at91sam9263";
        interrupt-parent = <&aic>;
@@ -45,6 +46,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x08000000>;
        };
 
index d16db1fa7e15c69dba0060dfc647211e440f607d..f368196071310cfc4d3a8d48624133c69599aaf0 100644 (file)
@@ -9,7 +9,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -17,6 +16,8 @@
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9G45 family SoC";
        compatible = "atmel,at91sam9g45";
        interrupt-parent = <&aic>;
@@ -51,6 +52,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x70000000 0x10000000>;
        };
 
index 37cb81f457b568aa48121336c4cacb89dce72cbe..f71d65e6e5100832dce120de2c5d6e9337f02b7b 100644 (file)
@@ -7,7 +7,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -15,6 +14,8 @@
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9N12 SoC";
        compatible = "atmel,at91sam9n12";
        interrupt-parent = <&aic>;
@@ -47,6 +48,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };
 
index 3862ff2f26e0738f9b24cc76eec23f18b7216612..6b5777f3c20b66a395feedad0615de6d990f1f6f 100644 (file)
@@ -7,7 +7,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/clock/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -15,6 +14,8 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9RL family SoC";
        compatible = "atmel,at91sam9rl", "atmel,at91sam9";
        interrupt-parent = <&aic>;
@@ -48,6 +49,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };
 
index 07443a387a8f6033e868512a716d55f64bd13afd..79c4956d390215dc1a9f9af2e9df820d79e96baf 100644 (file)
@@ -9,7 +9,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -17,6 +16,8 @@
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel AT91SAM9x5 family SoC";
        compatible = "atmel,at91sam9x5";
        interrupt-parent = <&aic>;
@@ -49,6 +50,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };
 
index ab042ca8dea120041f9c5702d02822b9697eee0c..40882419309ddf2b789df8f9ceca60ee04e2d86f 100644 (file)
@@ -15,6 +15,7 @@
        compatible = "sirf,atlas6-cb", "sirf,atlas6";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x20000000>;
        };
 
index 29598667420b83766c0e8fa0b05960d008f6007e..5587b98032a372c1fed48b6579df19360703e232 100644 (file)
@@ -6,7 +6,6 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
 / {
        compatible = "sirf,atlas6";
        #address-cells = <1>;
index 83449b33de6b32daccf190a6dc9960ed0f8799cb..f3de9af35b4dfa77f6290c640c219480ded60963 100644 (file)
@@ -6,7 +6,6 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
 / {
        compatible = "sirf,atlas7";
        #address-cells = <1>;
index 47799f59faa5cbdfc8dad50bee16c52f1a9d1775..2a93d3ee3b66f959fa0c5c68f5485f35f7929a67 100644 (file)
@@ -12,9 +12,9 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/lsi,axm5516-clks.h>
 
-#include "skeleton64.dtsi"
-
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        interrupt-parent = <&gic>;
 
        aliases {
index 253df7170a4e263bec22d589ddf6d34d0bccdacf..5f7b46503a51b2518e6eb7c2a733d16d528225f7 100644 (file)
@@ -34,9 +34,9 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/bcm-cygnus.h>
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "brcm,cygnus";
        model = "Broadcom Cygnus SoC";
        interrupt-parent = <&gic>;
                ethernet0 = &eth0;
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0 0>;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
index 0d2538b4613952c893ec0c0b213c9c7f21b02fe9..6925b30c22539d9bb24d931cb81df0ed818e8f28 100644 (file)
@@ -34,9 +34,9 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/bcm-nsp.h>
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "brcm,nsp";
        model = "Broadcom Northstar Plus SoC";
        interrupt-parent = <&gic>;
index db7cded1b7ada534ef34f49c27cd0dce34d7cdcc..b99c2e5796228b777353c05215d085613e01f822 100644 (file)
@@ -16,9 +16,9 @@
 
 #include "dt-bindings/clock/bcm281xx.h"
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "BCM11351 SoC";
        compatible = "brcm,bcm11351";
        interrupt-parent = <&gic>;
index e87cb26ddf849f8f69ef66655a6152485b63ac9b..8b045cfab64b3b7fb7cd773b74331536c14304f3 100644 (file)
@@ -22,6 +22,7 @@
        compatible = "brcm,bcm21664-garnet", "brcm,bcm21664";
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
 
index 266f2611dc22126705aab35cb6cb67601e9f3704..758daa334148352224324b365e8698bacd5bc23c 100644 (file)
@@ -16,9 +16,9 @@
 
 #include "dt-bindings/clock/bcm21664.h"
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "BCM21664 SoC";
        compatible = "brcm,bcm21664";
        interrupt-parent = <&gic>;
index 4d525ccb48c84e9df1a41801d35286954ccd0427..1c66b15f3013c3f356abc4797774a2389a66df4f 100644 (file)
@@ -46,6 +46,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
 };
index a7a643f383854ee341ad8dd4cc95395b1b55548c..701198f5f498397e0025dfdaa9a707835d590f91 100644 (file)
@@ -36,9 +36,9 @@
 /* BCM23550 and BCM21664 have almost identical clocks */
 #include "dt-bindings/clock/bcm21664.h"
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "BCM23550 SoC";
        compatible = "brcm,bcm23550";
        interrupt-parent = <&gic>;
index 9ce91dd60cb6629fb4ea95bdda4e0f7a7a4f1733..fbfca83bd28ff080b914049233a52aebb349b5ab 100644 (file)
@@ -22,6 +22,7 @@
        compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>; /* 1 GB */
        };
 
index 76a2bab3bc6f519644389da2b84147955fe4e4ba..fe842f2f1ca7437c3d1b05c8dace8c39d0ecee77 100644 (file)
@@ -20,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index 69e3570e03dd2c207cc6ad4b4f27d9c2420415d4..6fcbb0509ba0318e8e02e85eb166f82dc7c3f488 100644 (file)
@@ -20,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index 0f6f0fe13bfb461f12cb9d9abfb9edfd00c71be1..b3e8cc90b13fb3071fb109e4e98cb1bc53da47f8 100644 (file)
@@ -20,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index f7708974499671bc989ef1003f7e9dc7d3ebc151..fdeaa895512f63e33aee8b5c01d1608c54cca7b8 100644 (file)
@@ -16,6 +16,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 4d427863756fefcfafa1bfba5efd35f19bce477a..0d510cb15ec3a2e99ad85e1c2951cf6e0e74e35e 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 189cc3dcd6ef869065ea3dc9b633d92d062c6efd..962e89edba117ef209cf25ca10be94a6402ab357 100644 (file)
@@ -16,6 +16,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 03c1ab188576fd84862da334dac560d533f23bbc..658a56ff8a5cf81aaf059fb1a3b5802cb0415603 100644 (file)
@@ -20,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index 36efe410dcd71a54ae6f802e405fb9b60296b58f..5fd47eec4407e9b1a3e363b8dbf67b55d472a2a5 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index 3e5e9972cd976b061e3a9a97a381683aa3bf120f..6604be6ff0a0acdf86ae4ce8af8ac8bf591682cf 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x18000000>;
        };
index 7fd85475893d15ed2ad64c5e11b8acec205e74b0..567ebbd5a0e9641ca0a9ac487e1b21d0e778ff6b 100644 (file)
@@ -16,6 +16,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 7acbecd429502cc6b336279fab55ac3e4435e3fd..ac2d136ed334093d1c24278069e0588bab695f84 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x18000000>;
        };
index f4558d9d276956128abc7a936ea763187455002c..74371e821b1a498f573791891431b92baf416b5b 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x08000000>;
        };
index bdad7267255a3ef378320946e040f6a2c1a6e61f..b44af63ee3102d76a601d51a1ab94ecd08df0d4a 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x18000000>;
        };
index 30719380b6c0e1af3b3a7d1468c2e4a1444a2b88..eebc0d43e220b22f51516306bb28f7fa4339d308 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000
                       0x88000000 0x18000000>;
        };
index 74c83b0ca54e0c1937fe446ae487c0b4a6661ead..1a5ec22a172c477d83ae1452f5ec98871926be40 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 214df18f3a754c5c088126df547854d88c479952..42c1e1f3a4d523f9a4a924a9a8e75d6af70b86e2 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index e15e2a1e9d8c50a8f1ee87de0929bf282f73049c..5ad53ea52d0aab838076fdb6c4aceb41d132e968 100644 (file)
@@ -16,6 +16,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index fd7af943fb0b566a41b6dbdcf5e54dec29b20d0d..ac5266ee8d4ccce31ec40ab936591d7062c877c4 100644 (file)
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&gic>;
 
        chipcommonA {
index 431cda514230cf026cdc28063df385de645a0203..2e7fda9b998ccead2c2042b5320e13543cc6f079 100644 (file)
@@ -20,6 +20,7 @@
        };
 
        memory@0 {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>,
                      <0x68000000 0x08000000>;
        };
index 5054fa9eb0d0f5be7e1600fd0013acafb32811d4..b29695bd48551c8a2aed816b3663081c03cf2d6f 100644 (file)
@@ -7,9 +7,10 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&gic>;
 
        aliases {
index f59764008b9c6ed3f2d53755fb292ef8d26dcc33..e6a41e1b27fdffb2cc172a566d87110dd84c94e7 100644 (file)
@@ -6,9 +6,9 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "brcm,bcm63138";
        model = "Broadcom BCM63138 DSL SoC";
        interrupt-parent = <&gic>;
index c859aa6f358caef8f78706c8a86307fc789ff615..504a63236a5e4972bb57697de2d4b20dee9c9295 100644 (file)
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
-#include "skeleton.dtsi"
-
 / {
        #address-cells = <2>;
        #size-cells = <2>;
index ef263412fea513068a67a11ef80dff18d863802a..4991700ae6b0876f18ab66db13524001309bb39a 100644 (file)
@@ -18,6 +18,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index 17f63c7a04374ab1f23909c318cb01f56a16966f..250a1d6f2d05cdd3a12aaf32dcaafc1a594f9132 100644 (file)
@@ -40,6 +40,7 @@
        compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x8000000>;
        };
 
index 11b0f5ed99e6fc977c23dd38e6db1c61323467d6..9140be7ec053ccdf92cb830443306ea2798120ad 100644 (file)
@@ -46,6 +46,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 };
index e798055d6989d374609fd3cc49da44b0ea01ccb4..52c4c6c9d3f1fba30c9f7311f86886b94e42d5cb 100644 (file)
@@ -44,6 +44,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 };
index a5a23c3764188c98720c6a8773868ec1e02652cb..d2e8f36f8c60e1e191b12954ea006ea3a699ec67 100644 (file)
@@ -44,9 +44,9 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "cnxt,cx92755";
 
        interrupt-parent = <&intc>;
index 250ad0535e8cc642429dc45a2c9401f987bebf41..2e8a3977219f15749ed69574c84b0698c9824dbd 100644 (file)
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "marvell,dove";
        model = "Marvell Armada 88AP510 SoC";
        interrupt-parent = <&intc>;
index aaf1261d2ee49ee6c93e24127e3d65241cb96350..0e74222a5eae45d3e068e9dc09aba40c65cc9133 100644 (file)
@@ -6,11 +6,11 @@
 
 /dts-v1/;
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/clock/clps711x-clock.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Cirrus Logic EP7209";
        compatible = "cirrus,ep7209";
 
index bc9d5b69745298bab449c3a829edd25332dcd607..3475c7777cbcfe9a977c593f7146c90582cd2d7c 100644 (file)
@@ -12,6 +12,7 @@
        compatible = "cirrus,edb7211", "cirrus,ep7211", "cirrus,ep7209";
 
        memory {
+               device_type = "memory";
                reg = <0xc0000000 0x02000000>;
        };
 
index 4d58638d104b4b7060398500b51be5f79c04a51d..1612a869a4f7cb97a77505e3dd8e964887e31aa1 100644 (file)
@@ -3,9 +3,15 @@
  * 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 {
                compatible = "arm,core-module-integrator", "syscon", "simple-mfd";
                reg = <0x10000000 0x200>;
index 81c7eda2c44218ac87b151135ef5d67d204828e7..2161e23bd98ef042e73f7994f15c4dc7cf3ae3fb 100644 (file)
@@ -1,11 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
-/include/ "skeleton.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "marvell,kirkwood";
        interrupt-parent = <&intc>;
 
index b7303a4e4236f35f370153645989fabb0366d0a6..44b468e4c37af8f95adc58fbb2a2d87adea8b9fb 100644 (file)
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/clock/lpc32xx-clock.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "nxp,lpc3220";
        interrupt-parent = <&mic>;
 
index ed09412921723c6c4ba20a4bd30747bed966c078..97c1e37e9997fbcbb0940b24f992fa20ee5e5d91 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton64.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
 
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        compatible = "fsl,ls1021a";
        interrupt-parent = <&gic>;
 
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0 0x0 0x0>;
+       };
+
        sysclk: sysclk {
                compatible = "fixed-clock";
                #clock-cells = <0>;
index e4645f61271244fedeb0d128a6ad4535b452b6b2..5c303092520ac7ca6280f181ff1fbb1025fd2984 100644 (file)
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-/include/ "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&gic>;
 
        L2: l2-cache-controller@c4200000 {
index fc48cff71ddfd48e720b2f7a6d54090216d72398..997e69c5963e2727d091aee82ea1dbc29cc9d85d 100644 (file)
@@ -61,6 +61,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 };
index 55fb090a40ef445b2e7c522817b6398efa22f473..8686abd5de7fe47b1e355da76f0d5bc6d6ce8d93 100644 (file)
@@ -57,6 +57,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 
index 0872f6e3abf56f02c1f4d3f7423a3a6d17bda1a4..7b6bfb9e805d765d29c5277c32dc6f814e071b91 100644 (file)
@@ -23,6 +23,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 
index 5c9b76af8d42b39bff8c6b0e369a98b6b111cd9f..08ddd7fb0bf8ade757709714fcd2f791fa8c98e8 100644 (file)
@@ -60,6 +60,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 };
index 58669abda2594d4979086695db3af0aee095983b..4de2b973513db3d9c5c38c898e2ac56a2aaa2355 100644 (file)
@@ -62,6 +62,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 
index f5853610b20b804170e941c5b24d2b50b94a1d62..32c7a460f21b9d6f3b143a6d78cc0a74ac871214 100644 (file)
@@ -28,6 +28,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x80000000>;
        };
 
index 350208c5e1ed2f6d27d192d1c256ab58db5ecb27..3da038ba57331539c859a202f19200e0dd6f6d40 100644 (file)
@@ -19,6 +19,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x08000000>;
        };
 
index ee03e08467403ea6ffed9ee8c4e7d993dec1073a..f02fb97f515c255c01b3daf47c499542958bea96 100644 (file)
@@ -7,10 +7,12 @@
  *  publishhed by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/marvell,mmp2.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                serial0 = &uart1;
                serial1 = &uart2;
index da7b3237bfe9811ff9e8908310b8f146f938f21e..cbf17656bcc73e1baf7c21a365e879445033282d 100644 (file)
@@ -5,10 +5,11 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "moxa,moxart";
        model = "MOXART";
        interrupt-parent = <&intc>;
index be0edb3dae6c6299a3a5cf9dd7b42117c3e6928f..88f8fd22302a02b4f7ea194a88e56c714ff2ab53 100644 (file)
@@ -13,6 +13,7 @@
        compatible = "mediatek,mt2701-evb", "mediatek,mt2701";
 
        memory {
+               device_type = "memory";
                reg = <0 0x80000000 0 0x40000000>;
        };
 
index 180377e56ef49e437387b3cf536ecc0a5261618e..51e1305c6471c8c75ed834dc2af744baef390ee7 100644 (file)
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/memory/mt2701-larb-port.h>
 #include <dt-bindings/reset/mt2701-resets.h>
-#include "skeleton64.dtsi"
 #include "mt2701-pinfunc.h"
 
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        compatible = "mediatek,mt2701";
        interrupt-parent = <&cirq>;
 
index ca137897ed600eade79f6e2bae0bcafdc18c039b..755a0774a8eeba818b66355b7e89ebfd9f6eaa86 100644 (file)
@@ -22,6 +22,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 };
index 2bdc5ed12fca2ac7e341135485b8d397324cac21..9e17698c0609309993ca209e7ae3c22fb35ba92a 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
 
 / {
        compatible = "mediatek,mt6580";
index 7bbaa1279a26a1252822350be264d8764b0a4ece..1e7079a3b449f18b9edfc234ef59bdc0b0cba49a 100644 (file)
@@ -18,6 +18,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 
index 28df8495686ad19d15ec64b62a820205b5eaefc9..f3ccb70c0779c66d42d553572e6c7d90270ab0db 100644 (file)
@@ -7,9 +7,10 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "mediatek,mt6589";
        interrupt-parent = <&sysirq>;
 
index 02849f6548e3c5ebbb4be8834a32f011dc2d472d..5e00c1cca2d122ce1c8044607e084ca527c8e174 100644 (file)
@@ -13,7 +13,7 @@
        compatible = "mediatek,mt6592-evb", "mediatek,mt6592";
 
        memory {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 };
-
index 8696ac891d60970f221ebe264e4bfe381fa2aca9..3716f8db951ca174be1fad5798edbf28a8fde0ef 100644 (file)
@@ -7,9 +7,10 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "mediatek,mt6592";
        interrupt-parent = <&sysirq>;
 
index 308829b2da863309583dcffda8c63395eb3fbf11..560687af87dc53e586730810c284a88ee7e37670 100644 (file)
@@ -13,6 +13,7 @@
        compatible = "mediatek,mt8127-moose", "mediatek,mt8127";
 
        memory {
+               device_type = "memory";
                reg = <0 0x80000000 0 0x40000000>;
        };
 };
index 3adfc6f7859cf325aea07f4ee27c02ee9885300a..aced173c2a52e33eb1f6b9eee119d53adb15ef4c 100644 (file)
@@ -7,9 +7,10 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include "skeleton64.dtsi"
 
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        compatible = "mediatek,mt8127";
        interrupt-parent = <&sysirq>;
 
index 0ace7a40a60daa6094b8dcead9dd5e164734cbd9..f6147fe62f41588911a8f846b6207fc1d88924da 100644 (file)
@@ -13,6 +13,7 @@
        compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";
 
        memory {
+               device_type = "memory";
                reg = <0 0x80000000 0 0x40000000>;
        };
 };
index 688069dc15338f8d343401cd658ab765943f08f7..0e4e835026db00eb0cd0f94d2d1a560408fe4cb9 100644 (file)
@@ -9,10 +9,11 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/reset/mt8135-resets.h>
-#include "skeleton64.dtsi"
 #include "mt8135-pinfunc.h"
 
 / {
+       #address-cells = <2>;
+       #size-cells = <2>;
        compatible = "mediatek,mt8135";
        interrupt-parent = <&sysirq>;
 
index 1a5ae4cd107f08294c4bddce41d7369a76fa9ecd..5a3c1f9d18328994dbdab3bc665107c58df8f480 100644 (file)
@@ -9,9 +9,9 @@
  *
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&intc>;
 
        cpus {
index 8c2449da6f009217082bb25fb2855afb1ccaff7a..422958d13d42f1f5033b96ef65254e8d2ab882fa 100644 (file)
@@ -19,6 +19,7 @@
        compatible = "lacie,d2-network", "marvell,orion5x-88f5182", "marvell,orion5x";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x4000000>; /* 64 MB */
        };
 
index b545d0f228a526193995df9f04d3059dacbc6705..0043e0040153c4aeacf129f75e6b9ce47a280519 100644 (file)
@@ -25,6 +25,7 @@
        compatible = "lacie,ethernet-disk-mini-v2", "marvell,orion5x-88f5182", "marvell,orion5x";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x4000000>; /* 64 MB */
        };
 
index 0d97ded66257fd4d85b192d4f704bba650e4721f..2fbc17d6dfa4cd7536e842d7884eff842aaa6b5e 100644 (file)
@@ -55,6 +55,7 @@
        compatible = "buffalo,lswsgl", "marvell,orion5x-88f5182", "marvell,orion5x";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x8000000>; /* 128 MB */
        };
 
index 0324cb54939d463d2cefd5d733cd52f7e7378027..0ca6208a267de1e56e2abfaa71b19c453d3dcd83 100644 (file)
@@ -19,6 +19,7 @@
        compatible = "maxtor,shared-storage-2", "marvell,orion5x-88f5182", "marvell,orion5x";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x4000000>; /* 64 MB */
        };
 
index 9f6ae4e1de06be9fa8d7bca20d82bba0db3850a1..ea081afa469d924b6cd3601ea7abdbbb96511882 100644 (file)
@@ -21,6 +21,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x2000000>; /* 32 MB */
        };
 
index d1817af53e0bb2d0881ea7824211a034f5d27686..487324f7c54e749622c528a2ff72b5caae10530e 100644 (file)
@@ -16,6 +16,7 @@
        compatible = "marvell,rd-88f5182-nas", "marvell,orion5x-88f5182", "marvell,orion5x";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x4000000>; /* 64 MB */
        };
 
index fbccfbbab22307d2ff5cb271404e7b18ca3f27df..61e631b3fd8bb78979af4951c24e6036e2e57076 100644 (file)
@@ -6,11 +6,11 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include "skeleton.dtsi"
-
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Marvell Orion5x SoC";
        compatible = "marvell,orion5x";
        interrupt-parent = <&intc>;
index c2b48a1838eb2fafbe0c492017be28d757607fc7..3a26650de4ebca73b86f423604bedc637357a2c2 100644 (file)
@@ -6,11 +6,12 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
 #include <dt-bindings/clock/oxsemi,ox810se.h>
 #include <dt-bindings/reset/oxsemi,ox810se.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "oxsemi,ox810se";
 
        cpus {
@@ -25,6 +26,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* Max 256MB @ 0x48000000 */
                reg = <0x48000000 0x10000000>;
        };
index 085bbd33eadc25a4dc1d3fe6d635794c978b716f..f3239586f38d3b90e1923386b7ea98dfcd8b2bb1 100644 (file)
@@ -6,12 +6,13 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/oxsemi,ox820.h>
 #include <dt-bindings/reset/oxsemi,ox820.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "oxsemi,ox820";
 
        cpus {
@@ -35,6 +36,7 @@
        };
 
        memory {
+               device_type = "memory";
                /* Max 512MB @ 0x60000000 */
                reg = <0x60000000 0x20000000>;
        };
index a1266cf8776ce9aea1e13ef62bad3474161cbba0..291a28f34762fcff784c2bc8c999b6340e586efb 100644 (file)
@@ -10,7 +10,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-/include/ "skeleton.dtsi"
 / {
        model = "Picochip picoXcell PC3X2";
        compatible = "picochip,pc3x2";
index d78cd207eca1ac319841248a59629984e898e002..bf9a39ea76b05eaf06f6650ad34eb817b6cefddd 100644 (file)
@@ -10,7 +10,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-/include/ "skeleton.dtsi"
 / {
        model = "Picochip picoXcell PC3X3";
        compatible = "picochip,pc3x3";
index 57286b4e7b87e78f850af1bcb6150ea680e56fd6..55594b3bbc9902abc6435b3844a661fdee8cd91b 100644 (file)
@@ -15,6 +15,7 @@
        compatible = "sirf,prima2", "sirf,prima2-cb";
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x20000000>;
        };
 
index 1ca1a9aa953f7ee893fddf8b5a9217ddab7e2956..54d4f8850e22f0dde6e9b8ba4051090dfd024a54 100644 (file)
@@ -6,7 +6,6 @@
  * Licensed under GPLv2 or later.
  */
 
-/include/ "skeleton.dtsi"
 / {
        compatible = "sirf,prima2";
        #address-cells = <1>;
index b899e25cbb1be973c60dc8a8d8c220c02cf3c039..7137f355018304bd8806927f0d1870d89eedba7d 100644 (file)
@@ -7,10 +7,12 @@
  *  publishhed by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/marvell,pxa168.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                serial0 = &uart1;
                serial1 = &uart2;
index e83879d97aeae2e29419dc48a504a5a32e153b4d..bd6bf6d9300fb9f5da8569f20e7210ef50794f8f 100644 (file)
@@ -6,7 +6,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include "dt-bindings/clock/pxa-clock.h"
 
 #define PMGROUP(pin) #pin
@@ -29,6 +28,8 @@
        }
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Marvell PXA2xx family SoC";
        compatible = "marvell,pxa2xx";
        interrupt-parent = <&pxairq>;
index 0868f6729be1eaf60fc6df14887f449e92f750c6..c88553a8ee29b9ba615493e56a806bc6bf156d07 100644 (file)
@@ -7,10 +7,12 @@
  *  publishhed by the Free Software Foundation.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/marvell,pxa910.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                serial0 = &uart1;
                serial1 = &uart2;
index 48c3cf42761012c274707b2060298d36bea3379f..1374c2e52c20cdca276b8974bfc6505dfe9819c5 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/reset/qcom,gcc-msm8960.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8960.h>
@@ -10,6 +9,8 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm APQ8064";
        compatible = "qcom,apq8064";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        thermal-zones {
                cpu-thermal0 {
                        polling-delay-passive = <250>;
index 899f28533ed7f4afd405a446db4eea98dbc4009f..0a0fb147ebb93e61fd68a13303c03db256c6a984 100644 (file)
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "skeleton.dtsi"
-
 #include <dt-bindings/clock/qcom,gcc-apq8084.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm APQ 8084";
        compatible = "qcom,apq8084";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        firmware {
                scm {
                        compatible = "qcom,scm";
index 2d56008d8d6b53e8a79f9f6265838a22484c5e73..707017412be2526efb6bca2737049b86135b79e4 100644 (file)
 
 /dts-v1/;
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/qcom,gcc-ipq4019.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm Technologies, Inc. IPQ4019";
        compatible = "qcom,ipq4019";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        pmu {
                compatible = "arm,cortex-a7-pmu";
                interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
index f793cd1ad6d0d04109eaeb07b1395fb8ba0c63a6..16c0da97932c1f070f77ec8caa1a16127228f10a 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-ipq806x.h>
 #include <dt-bindings/clock/qcom,lcc-ipq806x.h>
@@ -11,6 +10,8 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm IPQ8064";
        compatible = "qcom,ipq8064";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        cpu-pmu {
                compatible = "qcom,krait-pmu";
                interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
index 7869898e392d9a9549c5efbbda50b0e19a62666c..26b034bd19d274bfa2264bca67a1325bfd7b2902 100644 (file)
@@ -50,6 +50,7 @@
        compatible = "swir,wp8548", "qcom,mdm9615";
 
        memory {
+               device_type = "memory";
                reg = <0x48000000 0x7F00000>;
        };
 };
index c852b69229c977281a6f7e7192d88c3275e80817..e49f67ad5dbc1190f88387b08530d952044e6173 100644 (file)
@@ -45,8 +45,6 @@
 
 /dts-v1/;
 
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-mdm9615.h>
 #include <dt-bindings/reset/qcom,gcc-mdm9615.h>
@@ -54,6 +52,8 @@
 #include <dt-bindings/soc/qcom,gsbi.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm MDM9615";
        compatible = "qcom,mdm9615";
        interrupt-parent = <&intc>;
index 70698941f64c09fdd2072cac169de244c0a2db1e..1c1a863fa0c29fa966d390f8c06989215471a991 100644 (file)
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8660.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm MSM8660";
        compatible = "qcom,msm8660";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        cpu-pmu {
                compatible = "qcom,scorpion-mp-pmu";
                interrupts = <1 9 0x304>;
index 1733d8f40ab15ddf39f2ad716d8b00e5c5dbb759..f2aeaccdc1ad6183d9d59499a701a75fcc9b32fc 100644 (file)
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
 #include <dt-bindings/mfd/qcom-rpm.h>
 #include <dt-bindings/soc/qcom,gsbi.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm MSM8960";
        compatible = "qcom,msm8960";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        cpu-pmu {
                compatible = "qcom,krait-pmu";
                interrupts = <1 10 0x304>;
index ca266a5f021d55dc99ec78a9a9e32304b73bd806..aa5ced5859c7c96bd466a2d064c328286d6cf8d9 100644 (file)
@@ -6,9 +6,10 @@
 #include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/reset/qcom,gcc-msm8974.h>
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Qualcomm MSM8974";
        compatible = "qcom,msm8974";
        interrupt-parent = <&intc>;
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        thermal-zones {
                cpu-thermal0 {
                        polling-delay-passive = <250>;
index dc2280d9127f9ed4d74e8fb5dab6c139794abca5..d159ee42ef294e2b978c2d7ccea7274141f225c5 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/at91.h>
 #include <dt-bindings/iio/adc/at91-sama5d2_adc.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel SAMA5D2 family SoC";
        compatible = "atmel,sama5d2";
        interrupt-parent = <&aic>;
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x20000000>;
        };
 
index 1408fa4a62e4410708804f06826cbf3a7a691065..02198772eb813d5ab18560050d4583a107b14ccd 100644 (file)
@@ -8,7 +8,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -16,6 +15,8 @@
 #include <dt-bindings/clock/at91.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel SAMA5D3 family SoC";
        compatible = "atmel,sama5d3", "atmel,sama5";
        interrupt-parent = <&aic>;
@@ -56,6 +57,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x8000000>;
        };
 
index 2604fd07dd533b14c1d93d74125cef8e6e5cfc46..6c1e41f94549cab3cae29bb8f0a2d8b593eb6aee 100644 (file)
@@ -43,7 +43,6 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/at91.h>
 #include <dt-bindings/dma/at91.h>
 #include <dt-bindings/pinctrl/at91.h>
@@ -51,6 +50,8 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Atmel SAMA5D4 family SoC";
        compatible = "atmel,sama5d4";
        interrupt-parent = <&aic>;
@@ -90,6 +91,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x20000000 0x20000000>;
        };
 
diff --git a/arch/arm/boot/dts/skeleton.dtsi b/arch/arm/boot/dts/skeleton.dtsi
deleted file mode 100644 (file)
index 34eda68..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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>; };
-};
diff --git a/arch/arm/boot/dts/skeleton64.dtsi b/arch/arm/boot/dts/skeleton64.dtsi
deleted file mode 100644 (file)
index 54e6377..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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>; };
-};
index 086b4b3332494ba6dff43cee8de14c34518850d5..390df643a174cb72150616a4a7d9c04593d41898 100644 (file)
@@ -11,9 +11,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&gic>;
 
        cpus {
index 118135d7589908b424db93f8981587f37c966a72..c47380763cae102e98d98b1889c4ccb92e5fb726 100644 (file)
@@ -11,9 +11,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        interrupt-parent = <&vic>;
 
        cpus {
index 00166eb9be86f097d51908b52a4a9cdc000083d6..0a634fb07452cbb19351665403eca292dd212201 100644 (file)
@@ -9,9 +9,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "st,spear600";
 
        cpus {
index fca76a696d9d7a939b9f18172453ba1941c91a7f..f78b4eabd68c269b6624a7062cfdf99878530dd9 100644 (file)
@@ -4,13 +4,13 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
-#include "skeleton.dtsi"
 
 / {
        #address-cells = <1>;
        #size-cells = <1>;
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x04000000>,
                    <0x08000000 0x04000000>;
        };
index 1bd1aba3322f111c67cf672019bb3aac9599d6cd..f4e7660fead77ab86fd7a0797341285728eb2717 100644 (file)
@@ -4,7 +4,6 @@
  */
 
 /dts-v1/;
-/include/ "skeleton.dtsi"
 
 / {
        model = "ST-Ericsson U300";
@@ -22,6 +21,7 @@
         };
 
        memory {
+               device_type = "memory";
                reg = <0x48000000 0x03c00000>;
        };
 
index ed7d7f46465e49881043b5aeddb47b5138cad72e..73ea84df7bf4c8fc87424d4776d9bf3d19219286 100644 (file)
@@ -61,6 +61,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x2000000>;
        };
 
index 8c081eaf20fea20e69282215d24b8d7d88912748..d90b0d1e18c799425241289090214d53fd825e17 100644 (file)
@@ -55,6 +55,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0xc0000000 0x2000000>;
        };
 
index 5ceb2cf3777ff425a41a59da6dc90fe08adc257e..e19d0fe7dbdac5178403cf98e35573483575020d 100644 (file)
@@ -60,6 +60,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x90000000 0x800000>;
        };
 
index 8d6f028ae285ca11beece355c3df4be2fe0f4dbe..c29aa9d2f6d3a4fc1fa3befcca193393f13ff691 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include <dt-bindings/clock/stm32fx-clock.h>
 #include <dt-bindings/mfd/stm32f4-rcc.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        clocks {
                clk_hse: clk-hse {
                        #clock-cells = <0>;
index 7937b43d77886bf200d4855b071123719cfd9ce2..a3ff04940aec10731933ed10abb63e3225dcda88 100644 (file)
@@ -61,6 +61,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x00000000 0x1000000>;
        };
 
index e3a7bd338d61f0a8cc36dc4a1009e8660407d5e1..0ba9c5b08ab960d22dc77acc4214fd5582950db0 100644 (file)
@@ -56,6 +56,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0xC0000000 0x800000>;
        };
 
index f48d06a80d1d67e09cb2e0ba2a9873583df28947..a25b7000a3a14c7e0804e9a4f639315e512ed25b 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include <dt-bindings/clock/stm32fx-clock.h>
 #include <dt-bindings/mfd/stm32f7-rcc.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        clocks {
                clk_hse: clk-hse {
                        #clock-cells = <0>;
index 483d896e2bc13376b0a261474ccdb6a56dcbf32d..3c7216844a9bf104a0e3c9493a2870d0904f77cd 100644 (file)
@@ -56,6 +56,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0xC0000000 0x1000000>;
        };
 
index cbdd69ca9e7a6e5c6215c646d6fa395ac6034dae..299af0723790a8fdd5c92738af84d34128cbd423 100644 (file)
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include <dt-bindings/clock/stm32h7-clks.h>
 #include <dt-bindings/mfd/stm32h7-rcc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        clocks {
                clk_hse: clk-hse {
                        #clock-cells = <0>;
index 45e088c55741a86e65e4f2ed9344b01a6c7af6e6..f8040356fe2d474e3381e1fb52a15de8444ef2ba 100644 (file)
@@ -54,6 +54,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0xd0000000 0x2000000>;
        };
 
index 3f8e0c4a998d0cec39c592bc8f7688e9327bf12b..ef34fa2f79eadac0906689a36249225e190225c4 100644 (file)
@@ -54,6 +54,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0xd0000000 0x2000000>;
        };
 
index c3ecb1e10d947be3937fa445bb5d02e6fd8a2142..2890204680ba7b48730bb32e6acd406618418450 100644 (file)
@@ -17,6 +17,7 @@
        };
 
        memory@c0000000 {
+               device_type = "memory";
                reg = <0xC0000000 0x40000000>;
        };
 
index 6f4f60ba5429c8dedcd3a9863c5558a5e0b8199d..269e6bf99ccb39d287298e28227f9349a430dcdf 100644 (file)
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
-/include/ "skeleton.dtsi"
 
 / {
        model = "ARM Versatile AB";
@@ -21,6 +20,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x0 0x08000000>;
        };
 
index 1929ad390d88feb0ec42bce29ad1b174823ed55b..8b5af039b0721bc92a40ab1396b1f30a08aca446 100644 (file)
@@ -6,9 +6,9 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "via,vt8500";
 
        cpus {
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
index e9ef539e13d318378dde5803c7e7e00c5f18865f..cca6747304c405be925b869b21b1c5dc4bb39bdd 100644 (file)
@@ -6,9 +6,9 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "wm,wm8505";
 
        cpus {
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
index e12213d16693b890d0440e2da264a25b591e789a..00d01769a68ffd09bd191c83bd90aac0bc4cba6c 100644 (file)
@@ -6,9 +6,9 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "wm,wm8650";
 
        cpus {
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
index 46d076d7302b24e5234de911f66ff950205f67d5..54d8f7d9bb339fce495d8b8301f9a7132f9e9dde 100644 (file)
@@ -6,9 +6,9 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "wm,wm8750";
 
        cpus {
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
index 8fbccfbe75f33df7be79ea7be37c15b9f5bf2535..c572d777077fdc07faad0f1bf15e39cc250569fd 100644 (file)
@@ -6,9 +6,9 @@
  * Licensed under GPLv2 or later
  */
 
-/include/ "skeleton.dtsi"
-
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "wm,wm8850";
 
        cpus {
                };
        };
 
+       memory {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        aliases {
                serial0 = &uart0;
                serial1 = &uart1;
index eedd3fcbc002de9420d45f81d195d1d4136fea49..bd94008400237a5ed811f2fae1044d5dc5a17d4b 100644 (file)
@@ -14,6 +14,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x50000000 0x20000000>;
        };
 };
index 240e7a23d81ff3cc2eb2facad8a126970775a152..afd98de029be8bdd0cab7c45e14c5aa7a950bcf1 100644 (file)
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include "skeleton.dtsi"
 #include <dt-bindings/clock/zx296702-clock.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;