ARM: dts: at91: add unit-address to memory node

The memory node requires a unit-address, add it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20200831171129.3886857-7-alexandre.belloni@bootlin.com

diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index 6d7fc9c6c6e0c91bdea3618e1ed849282ef12dae..7da718abbd8529b8fba636b4cd599439a5479eee 100644 (file)
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -26,7 +26,7 @@
                stdout-path = &usart2;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index 2ef39ecbda183e2d9f4c7faf0f82e42a1e89b5b9..713d18f8035687cc043e05349cdaffb1bc9ae6c0 100644 (file)
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -22,7 +22,7 @@
                bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait";
        };
 
-       memory {
+       memory@20000000 {
                /* 128 MB, change this for 256 MB revision */
                reg = <0x20000000 0x8000000>;
        };

diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
index 2eb494f49078e82f1d4be48336be62171d3b8ac7..2c52a71752c2d499cde229113d1e983272b65658 100644 (file)
--- a/arch/arm/boot/dts/at91-ariettag25.dts
+++ b/arch/arm/boot/dts/at91-ariettag25.dts
@@ -15,7 +15,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index 91e386d4872fe50b31b8aaa88f10233149ff289b..ee0f5da6d819776b78330f8a1289bf99a833dcfb 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -20,7 +20,7 @@
                bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-foxg20.dts b/arch/arm/boot/dts/at91-foxg20.dts
index c0509c4e5138fc997d0923284b8304a3e19ce548..7edf057047f8f06bf0a49a05a6182a451861afdd 100644 (file)
--- a/arch/arm/boot/dts/at91-foxg20.dts
+++ b/arch/arm/boot/dts/at91-foxg20.dts
@@ -17,7 +17,7 @@
                bootargs = "console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index 7d938ccf71b0232016245e6d9ad6ec23edf3dafa..7add151f625070749799d175c92ea9e787fd2503 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -18,7 +18,7 @@
                stdout-path = &dbgu;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x2000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-kizbox2-common.dtsi b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
index af38253a6e7aedba8201888b50dc1ac87dcce920..25f7610651069a17ca442b8aa8acf8d5d1ab2083 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox2-common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
@@ -17,7 +17,7 @@
                stdout-path = &dbgu;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
index fddf267b2d17649a87968c7e839dd8cbae07bfaa..d37724c1069510d2691a1300b511f8f9252c5fcd 100644 (file)
--- a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
+++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
@@ -16,7 +16,7 @@
                stdout-path = &dbgu;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-linea.dtsi b/arch/arm/boot/dts/at91-linea.dtsi
index 41f163955b1e1fbf4dec3da094cd48abcbe33829..533a440d5583e6df4ca20fede9f7fb29d8cd86d4 100644 (file)
--- a/arch/arm/boot/dts/at91-linea.dtsi
+++ b/arch/arm/boot/dts/at91-linea.dtsi
@@ -13,7 +13,7 @@
        compatible = "axentia,linea",
                     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 };

diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
index ee8525d5a5da11be36db1f38924cc44b9a98e41a..969d990767fc1a6082d126ccb8642f80aff07811 100644 (file)
--- a/arch/arm/boot/dts/at91-qil_a9260.dts
+++ b/arch/arm/boot/dts/at91-qil_a9260.dts
@@ -14,7 +14,7 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-sam9_l9260.dts b/arch/arm/boot/dts/at91-sam9_l9260.dts
index f475c0b0f1de103030736dd4557aba413de7748d..1e2a28c2f365d39a685f4524bcf0feced1dd431c 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9_l9260.dts
+++ b/arch/arm/boot/dts/at91-sam9_l9260.dts
@@ -15,7 +15,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 7abf555cd2fe31e517a61b1546489850a6c08c48..cf13632edd4446afb569b9d7108497ccd9f5464b 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
index 0be184a870eb81b915f454ce909188d6561a1c01..710cb72bda5aeab56b8d711beda8ec1d3f38c3d6 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
@@ -9,7 +9,7 @@
        model = "Aries/DENX MA5D4";
        compatible = "aries,ma5d4", "denx,ma5d4", "atmel,sama5d4", "atmel,sama5";
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 924d9491780da2be265983ca9db597378a353aaa..e5974a17374cfeb32d68c64b093c07c67eb581f0 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index 0cc1cff13e46e1e372a4967dc389f48897889e67..fe432b6b7e951d388066898cef9e544d90feef4e 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-som60.dtsi b/arch/arm/boot/dts/at91-som60.dtsi
index 241682a207c524c15f216e85bb52efdb9c4fab77..39474a112b16eca268b4224603cbffb660ae091e 100644 (file)
--- a/arch/arm/boot/dts/at91-som60.dtsi
+++ b/arch/arm/boot/dts/at91-som60.dtsi
@@ -16,7 +16,7 @@
                stdout-path = &dbgu;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-vinco.dts b/arch/arm/boot/dts/at91-vinco.dts
index 15050fdd479d6a29601b648bef3eef32668439e6..a51a3372afa12be4a29c89b3a7f320032642931d 100644 (file)
--- a/arch/arm/boot/dts/at91-vinco.dts
+++ b/arch/arm/boot/dts/at91-vinco.dts
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-wb45n.dtsi b/arch/arm/boot/dts/at91-wb45n.dtsi
index e3d98306ee3ae9bf697acb49023401501679841b..430c75358086fc01178b7847155b64e7f4dc8bc2 100644 (file)
--- a/arch/arm/boot/dts/at91-wb45n.dtsi
+++ b/arch/arm/boot/dts/at91-wb45n.dtsi
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91-wb50n.dtsi b/arch/arm/boot/dts/at91-wb50n.dtsi
index 1487b893cfa76631f1c110db22002e79b9d9deb4..74b249bb635196ca2c7e173606904648d17d0f4e 100644 (file)
--- a/arch/arm/boot/dts/at91-wb50n.dtsi
+++ b/arch/arm/boot/dts/at91-wb50n.dtsi
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 };

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 0ea0aff2a024f81295d0e71fc58636b534c41329..d1181ead18e5a86e0ada25d6ea287dffdca921f0 100644 (file)
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -49,7 +49,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };

diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index 1e0bf5afa913effa93260bf975c006fbe7390291..e1ef4e44e663d2c7c794dc54e48138ba60922017 100644 (file)
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -15,7 +15,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index b07578ff214cc81b726b45663403a9b828814a29..82c5d7fd9811fa094b55b41f59849daaa3bb65d9 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -46,7 +46,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts
index 657dc3a420d6165483ddef7a2225a6b7627ed970..d3446e42b5983a515eabaef01ebcac4ba257f557 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/at91sam9260ek.dts
@@ -16,7 +16,7 @@
                stdout-path = &dbgu;
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 980cc308fec5168b6e3bae8a7a0bc5707c634097..7adc36ca8a467572f18612f7cf4ff14321ab4735 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -43,7 +43,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x08000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index c4ef74fea97c222b3b60412a3fbbeb240d1d4a05..beed819609e8d365add7df4cbf1af61f39354ed2 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index aea70a32511cbb44fa8c7d4e54f6035d2b3e74da..fe45d96239c9a82786bfd1238eff9be38344ba64 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -45,7 +45,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x08000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index bf89cb2bbdd98e0773fedc2d3baa07c9af52ec20..71f60576761a0cc35519582a7c6f18e8074d48cb 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -16,7 +16,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 86b4e943089acb4e4525924eef46a5aea9c4e37c..708e1646b7f46a015944db9b77b780312dda027a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -11,7 +11,7 @@
        model = "Atmel AT91SAM9G20 family SoC";
        compatible = "atmel,at91sam9g20";
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index c656515496929d89447b757b3a4b7f19480a9668..6e6e672c0b86df1d91e57d92a41b8e59caa13146 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -13,7 +13,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 1e1b7490ee0ab9e05f679a2d5e3b2f43bc647b18..19fc748a87c58849b0cf38414a599ceecfe3dd3a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -51,7 +51,7 @@
                };
        };
 
-       memory {
+       memory@70000000 {
                device_type = "memory";
                reg = <0x70000000 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 09b29126f60d9ece94ae3e993f75fd2741b4d07c..9734667abbfc380b12e023b27e2f67deb282056b 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@70000000 {
                reg = <0x70000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 5c27ead05284c3b8e441537395c5ca3ed4e8de75..0785389f5507755ed0b4cea963f162fb898855e3 100644 (file)
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -47,7 +47,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 870b83ff6b972f9dcbf73cbd94e7512c4b6e79e8..2bc4e6e0a923bfb1e2d076facbb99dbd06886a37 100644 (file)
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index eb5bea473bc88ed35151cdabe0bfbe9993f5b330..5653e70c84b4b9686034c90968da157ba0c351fa 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -48,7 +48,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x04000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 0de75d3c4f18c61a502d021078e20c7835d24d90..1590862f16f2edc6b616a3d4f5de9e79efe04c91 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 79076e4ed1e04e0a2b8e620d10741d54dec32072..4cdb05079cc73100ff2540735dc6c814ba92ec0c 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -49,7 +49,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 75d2f7fd314f1e9e4c94e1a31af64fe5a7a2e99e..cdd37f67280bfe2d7965c013ed24fc52a857463d 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -7,7 +7,7 @@
  */
 
 / {
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/ethernut5.dts b/arch/arm/boot/dts/ethernut5.dts
index 052a52f947ce665cd1f18ced6f4ba1096d2eb032..ad7a0850252a1fddcf25eae341705454c16687ae 100644 (file)
--- a/arch/arm/boot/dts/ethernut5.dts
+++ b/arch/arm/boot/dts/ethernut5.dts
@@ -15,7 +15,7 @@
                bootargs = "console=ttyS0,115200 root=/dev/mtdblock0 rw rootfstype=jffs2";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/mpa1600.dts b/arch/arm/boot/dts/mpa1600.dts
index a5c91c240db96c05a4a6c5fea751c38aae2880f7..005c2758e229c36dad92f947ca91e5586284757f 100644 (file)
--- a/arch/arm/boot/dts/mpa1600.dts
+++ b/arch/arm/boot/dts/mpa1600.dts
@@ -11,7 +11,7 @@
        model = "Phontech MPA 1600";
        compatible = "phontech,mpa1600", "atmel,at91rm9200";
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index f52f5eea430a6fde3d47eaa3b7ef2c705e99986b..c349fd3758a628941b35ee715c89a871f57ef1f5 100644 (file)
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -15,7 +15,7 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       memory {
+       memory@70000000 {
                reg = <0x70000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi
index 3e85c2a0d1983d4ee0404099ad43c846b2531ea2..04ad6b95647158361aa5dc1a336a0692942f5aaa 100644 (file)
--- a/arch/arm/boot/dts/sam9x60.dtsi
+++ b/arch/arm/boot/dts/sam9x60.dtsi
@@ -42,7 +42,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index ddd7f9b05aa298fe1d37cdd21d2b1124b3b20c20..c4aecfa4a2bec25899b09fc329807844df3d68fd 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -72,7 +72,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 4f9001188511a64a8b1af2529f23d9ae6cbe1804..86137f8d2b45cf5e8a68404820aae2af5c327a57 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -55,7 +55,7 @@
                interrupts = <46 IRQ_TYPE_LEVEL_HIGH 0>;
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x8000000>;
        };

diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index 65566e4b78d8ab6c52884e2a2d0f83b44cdd6709..384335635792f811c59ede0ae4c8988978556aa0 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -14,7 +14,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi b/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
index 9d2563602cbecad654c8b7a7541db44990c90b4d..5579c955f1411e37485404777de35cc19767fc8d 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
@@ -12,7 +12,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 1aca4b462f52b92f116b0e6e3b8bf0bde9a41df6..04f24cf752d34935d53a03abb5f10e4998141ca4 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -53,7 +53,7 @@
                };
        };
 
-       memory {
+       memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/tny_a9260_common.dtsi b/arch/arm/boot/dts/tny_a9260_common.dtsi
index dd6957b207728062b9f6054378df1afe7502691f..70e5635c78edce73095798b3c7ad9138f0962c33 100644 (file)
--- a/arch/arm/boot/dts/tny_a9260_common.dtsi
+++ b/arch/arm/boot/dts/tny_a9260_common.dtsi
@@ -10,7 +10,7 @@
                bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock6 rw rootfstype=ubifs";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/tny_a9263.dts b/arch/arm/boot/dts/tny_a9263.dts
index 2820635952e331823f9439fd8c70672f1b4f5b2e..62b7d9f9a926c5be5a7ae01e66880e9f2b7af341 100644 (file)
--- a/arch/arm/boot/dts/tny_a9263.dts
+++ b/arch/arm/boot/dts/tny_a9263.dts
@@ -15,7 +15,7 @@
                bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/usb_a9260.dts b/arch/arm/boot/dts/usb_a9260.dts
index ec8cd86b260d29689ba9cbab8d22088a5c5fe211..6cfa83921ac26463d10246833b7eab251edb676f 100644 (file)
--- a/arch/arm/boot/dts/usb_a9260.dts
+++ b/arch/arm/boot/dts/usb_a9260.dts
@@ -16,7 +16,7 @@
                bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts
index e7a705fddda9528da62bf9799b3cfe5a85bfe966..8a0cfbfd0c452bc5e37b0c8dc9b61d7bf0633cb1 100644 (file)
--- a/arch/arm/boot/dts/usb_a9263.dts
+++ b/arch/arm/boot/dts/usb_a9263.dts
@@ -15,7 +15,7 @@
                bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/usb_a9g20_common.dtsi b/arch/arm/boot/dts/usb_a9g20_common.dtsi
index adbe75024739798338ef3cde2a6b1a537afb5399..7d10b36db1eef0181223e4ea5659d0e270b85136 100644 (file)
--- a/arch/arm/boot/dts/usb_a9g20_common.dtsi
+++ b/arch/arm/boot/dts/usb_a9g20_common.dtsi
@@ -14,7 +14,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@20000000 {
                reg = <0x20000000 0x4000000>;
        };