ARM: dts: imx51: Fix memory node duplication

Boards based on imx51 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx51.dtsi file.

Fix the duplication by removing the memory node from the dtsi file
and by adding 'device_type = "memory";' in the board dts.

Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
index 79d80036f74de643f3c0e210bcb363fd239a9526..1eddf2908b3f2962d46d32245d618f243cb794ef 100644 (file)
--- a/arch/arm/boot/dts/imx51-apf51.dts
+++ b/arch/arm/boot/dts/imx51-apf51.dts
@@ -22,6 +22,7 @@ / {
        compatible = "armadeus,imx51-apf51", "fsl,imx51";
 
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 35ee1b4247c3a1266086edaddfff1095077d17b4..ed6a3ce874b28debcfda0cf8c6c29e5e377cf8dc 100644 (file)
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -15,6 +15,7 @@ chosen {
        };
 
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index 5761a66e8a0d3736f9c4776690174883bdb2dd14..82d8df097ef1fbb6296640fe1631bd90c604db92 100644 (file)
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -17,6 +17,7 @@ / {
        compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";
 
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0x08000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
index f8902a338e49a40b27814230d0228fd675e62649..2e3125391bc49a78e3a3be67fa567cd3c9705672 100644 (file)
--- a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+++ b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
@@ -23,6 +23,7 @@ / {
        compatible = "eukrea,cpuimx51", "fsl,imx51";
 
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0x10000000>; /* 256M */
        };
 };

diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
index 39eb067904c3ded221952cc1770f397d90cd019d..4344632f794002e054c86f40121d7059347f70e0 100644 (file)
--- a/arch/arm/boot/dts/imx51-ts4800.dts
+++ b/arch/arm/boot/dts/imx51-ts4800.dts
@@ -18,6 +18,7 @@ chosen {
        };
 
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index e45a15ceb94bc4f88a4e89029dd5c18fb7e81853..3ca4f9b750b0a8976ebaee6bcae90dfaec6aae11 100644 (file)
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -53,6 +53,7 @@ chosen {
 
        /* Will be filled by the bootloader */
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
index 243d1c8cab0a13c52f80593e7dec76df104389cd..aa91e5dde4b82c5422424b211c8ec9735184b859 100644 (file)
--- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
+++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
@@ -18,6 +18,7 @@ chosen {
 
        /* Will be filled by the bootloader */
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
index 14b207778114a9dee5e72d98b1888ab13e4844a2..875b10a7d6746b0a0fb8e90e8ade8879a509f3fa 100644 (file)
--- a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
+++ b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
@@ -18,6 +18,7 @@ chosen {
 
        /* Will be filled by the bootloader */
        memory@90000000 {
+               device_type = "memory";
                reg = <0x90000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 67d462715048f28da7ec9caec5af01ab4741816d..7651bedabdfb86cce36dda7be05fdb875af0c071 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -16,10 +16,8 @@ / {
         * The decompressor and also some bootloaders rely on a
         * pre-existing /chosen node to be available to insert the
         * command line and merge other ATAGS info.
-        * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;