ARM: dts: imx6sx: Fix memory node duplication

Boards based on imx6sx have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6sx.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/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index adb5cc7d8ce2fc3feb189a525ca9061d59b5e56e..832b5c5d7441a64a79e685f4f51ff4f83e6a39a2 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@ -12,6 +12,7 @@ / {
        compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 841a27f3198ff88b4f58e9fd3286ce080ad3117c..48aede543612b76b892fa3f8356287ededdd3f26 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -11,6 +11,7 @@ / {
        compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 53b3408b5fab1845248b2b7ff078eba462f730ab..59b377436065fc012eae0b6e2ca1d69095bbfc31 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -21,6 +21,7 @@ chosen {
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
index 252175b592475743b77a765607534f9cffbe803c..2bc51623a8060d08042c3e8cf601ec65e937e35e 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
@@ -21,6 +21,7 @@ chosen {
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
index 40ccdf43dffc56109dedb9cbca391c2a7ca2c711..db0feb9b9f5d7ef3dfce9181566287e14d6a1b75 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
@@ -49,6 +49,7 @@ / {
        compatible = "udoo,neobasic", "fsl,imx6sx";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
index 42bfc8f8f7f6b56eae4071ee48ef11a797d324d3..5c7a2bb9141cba474375434f1f6fa84bd7a047e5 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
@@ -49,6 +49,7 @@ / {
        compatible = "udoo,neoextended", "fsl,imx6sx";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
index c84c877f09d499fff1665d7005c3845207c18e79..13dfe2afaba563ce5648a78d6756a0300370133e 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
@@ -49,6 +49,7 @@ / {
        compatible = "udoo,neofull", "fsl,imx6sx";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 54262671b0539383fa14a728a4f81801e9a0e380..6c8d2bb0902553c59ec395474a0faa502b7c887b 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -15,10 +15,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 {
                can0 = &flexcan1;