From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 12 Aug 2015 09:25:05 +0000 (+0200)
Subject: ARM: dts: Rename memory@0 to memory
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f208ec45e3812605664c64fd08cab797b3057e56;p=thirdparty%2Fu-boot.git

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-afx-nand.dts b/arch/arm/dts/zynq-afx-nand.dts
index cbb56a69793..5587c008769 100644
--- a/arch/arm/dts/zynq-afx-nand.dts
+++ b/arch/arm/dts/zynq-afx-nand.dts
@@ -28,7 +28,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory@0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
diff --git a/arch/arm/dts/zynq-afx-nor.dts b/arch/arm/dts/zynq-afx-nor.dts
index 3c79ae384ca..5af5630bf5d 100644
--- a/arch/arm/dts/zynq-afx-nor.dts
+++ b/arch/arm/dts/zynq-afx-nor.dts
@@ -28,7 +28,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory@0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
diff --git a/arch/arm/dts/zynq-afx-qspi.dts b/arch/arm/dts/zynq-afx-qspi.dts
index 9c2f9d7e899..7e8d2d56d14 100644
--- a/arch/arm/dts/zynq-afx-qspi.dts
+++ b/arch/arm/dts/zynq-afx-qspi.dts
@@ -29,7 +29,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory@0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts
index 038cb5773c2..49f25477303 100644
--- a/arch/arm/dts/zynq-cc108.dts
+++ b/arch/arm/dts/zynq-cc108.dts
@@ -30,7 +30,7 @@
 		stdout-path = &uart1;
 	};
 
-	memory@0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x20000000>;
 	};
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 61c7fd7c5dd..c20e7f44191 100644
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -26,7 +26,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 cf54113f3f9..8be3c958b8a 100644
--- 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 82a0005ad2b..5d1c4cd4765 100644
--- 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 a6e89be3921..77ba5bc9529 100644
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -26,7 +26,7 @@
 		stdout-path = &uart0;
 	};
 
-	memory@0 {
+	memory {
 		device_type = "memory";
 		reg = <0x0 0x40000000>;
 	};