ARM: dts: Rename memory@0 to memory

zynq-7000.dtsi include skeleton.dtsi which contains memory node with
base address and size zero. If you add memory@0 node to the platform DTS
in final DTB there are two memory nodes and U-Boot works with the first
one (with zeros) which end up in failing in dram_init because size is
zero.
Platform memory node should rewrite default memory node setup from
skeleton.dtsi that's why platfroms needs to also use memory as node name
instead of memory@0.

Reported-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index da3a182ea1e1706a513048949686d5f01051e5b3..680f24c9c44d7cefaa219422535921bc897d7dde 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -25,7 +25,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index d38c8201353c1a7e4686e2cb5691f6cecbac369d..f73c0ddcb8d4220c3ebaf9342221f9944fb40dd7 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -23,7 +23,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index f8cc5039d6b776aa62644248198d4f130fea63bc..4289e31f4615e891363264bc7e1f3d2be9d03ff0 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -25,7 +25,7 @@
                stdout-path = &uart1;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index 436a8cd1b9a9d4112752a6555d754a4103fd750a..5124cdc5cdf04267c81a647d2b0904455163feeb 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -25,7 +25,7 @@
                stdout-path = &uart0;
        };
 
-       memory@0 {
+       memory {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };