ARM: at91: dt: remove unit-address part for memory nodes

Because of the inclusion of skeleton.dtsi, the memory node is
named "memory" we where not modifying the already included one
but creating a new one. It caused bad memory node detection during
early_init_dt_scan_memory() so we modify them.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: devicetree-discuss@lists.ozlabs.org

diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 92f36627e7f8a3414ba87f020b051b5c283b69eb..799ad1889b51d6232026b716b3a75205e1042c6f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -35,7 +35,7 @@
                };
        };
 
-       memory@20000000 {
+       memory {
                reg = <0x20000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 3d0c32fb218f4682a1400b38fc00e51195f85752..9e6eb6ecea0e3898bc6a0883c4d4bf443ca126c7 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -36,7 +36,7 @@
                };
        };
 
-       memory@70000000 {
+       memory {
                reg = <0x70000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 6abb5710a01eb94579d38fa47a6786de6d306d41..a3633bd1311145168f36278afbed6dfe9e6bce76 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -17,7 +17,7 @@
                bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
        };
 
-       memory@70000000 {
+       memory {
                reg = <0x70000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 6597177686332963d3cb764e2fd4b4f13b3a98a8..70ab3a4e026f0fb0c7d50f335cf893e120d8277a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -34,7 +34,7 @@
                };
        };
 
-       memory@20000000 {
+       memory {
                reg = <0x20000000 0x10000000>;
        };
 

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

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