ARM: vexpress: rename device tree "memory@..." nodes to "memory"

If CONFIG_ARM_ATAG_DTB_COMPAT enabled it expects the memory
information to be in a node named "memory".  If the memory is
described in a different node, the device tree will end up with two
nodes describing the memory.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>

diff --git a/arch/arm/boot/dts/vexpress-v2p-aem-v7a.dts b/arch/arm/boot/dts/vexpress-v2p-aem-v7a.dts
index 064132e480607e1e1f168da384e75eb5516b9405..66679363b3e1a857d11408f4bfc15d39914d7a7b 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-aem-v7a.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-aem-v7a.dts
@@ -33,7 +33,7 @@
                };
        };
 
-       memory@80000000 {
+       memory {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 02cada524c3049fb66a832c498e202a00a8756e4..0d82ac801dca905fcb6fee414c82f3034aa06d7a 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -43,7 +43,7 @@
                };
        };
 
-       memory@80000000 {
+       memory {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index da26a135e16c6156b2439a3b7d1078cae3cf56b6..e4c39354e21c0c27fe95eaac3978a163aa80dc2c 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -45,7 +45,7 @@
                };
        };
 
-       memory@80000000 {
+       memory {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 84542e73b49c2d697dc0c4929e03558cfb66cfdf..d4aa1cce888a266ca795e02381d14526e785ac65 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -59,7 +59,7 @@
                };
        };
 
-       memory@60000000 {
+       memory {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;
        };