ARM: dts: imx53: Fix memory node duplication

Boards based on imx53 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx53.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/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 117bd002dd1d11bb942ec811ed9dbad4339dd5fa..7d5a48250f86732d1bc0393eda1b0f89f55ced90 100644 (file)
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -19,6 +19,7 @@ / {
        compatible = "fsl,imx53-ard", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
index cf70ebc4399a21bf5b4074aca4eea99b71c6e250..c875e23ee45fb936e025abbac515e30d6bc0eae7 100644 (file)
--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@@ -22,6 +22,7 @@ chosen {
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
index ce45f08e30514b4a61f1c336b0964071bc40aaa6..db2e5bce9b6a1dad7eb3b58520868ddf1099fcc0 100644 (file)
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -16,6 +16,7 @@ / {
        compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 50dde84b72ed762ea87e4f21ed5aa260a548bd1b..f00dda334976abf53e37b367ab76938bdc06de4c 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -11,6 +11,7 @@ chosen {
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };

diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 462071c9ddd7399a1234347d2f5db8b69e8a1292..09071ca11c6cfa1d0ef5adbed75289847d00caab 100644 (file)
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -12,6 +12,7 @@ / {
        compatible = "fsl,imx53-smd", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
index a72b8981fc3bd800d047596ca8732160a003861b..c77d58f06c94924e86a1edc99c6b090f53313fc4 100644 (file)
--- a/arch/arm/boot/dts/imx53-tqma53.dtsi
+++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
@@ -17,6 +17,7 @@ / {
        compatible = "tq,tqma53", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>; /* Up to 1GiB */
        };
 

diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 54cf3e67069a9c7771d24b93e47a9368f6a6053f..4ab135906949f274ccfa592fa7aabaaa5ab8cc81 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -51,6 +51,7 @@ / {
 
        /* Will be filled by the bootloader */
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
index f6268d0ded2966fc173674e147e40f6d54937c8c..ee6263d1c2d3ddf4020a769a662fbb2abe726699 100644 (file)
--- a/arch/arm/boot/dts/imx53-usbarmory.dts
+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
@@ -58,6 +58,7 @@ chosen {
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 207eb557c90ebd28b8643e6c3fa579f50abe398e..930e2e14d339fa24b950157cdeb7d90273c04ee5 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -23,10 +23,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;