ARM: dts: imx23: Fix memory node duplication

Boards based on imx23 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx23.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/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index 98efe1aeb26a505185e71080f7919a174d3a7c9c..0b2701ca29212c1d800a8ed04e0958c22507c54c 100644 (file)
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -10,6 +10,7 @@ / {
        compatible = "fsl,imx23-evk", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index 31b1e3581ac040852abfa74a36b5937197869772..e2bac4d8f5076c090cb970a21cbebcd457060c22 100644 (file)
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -20,6 +20,7 @@ / {
        compatible = "olimex,imx23-olinuxino", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts
index faf701b2adb29a6675eec35711f5afdb3a4f3fba..46057d9bf555b61885e5d19375e1c1c4bae7db72 100644 (file)
--- a/arch/arm/boot/dts/imx23-sansa.dts
+++ b/arch/arm/boot/dts/imx23-sansa.dts
@@ -50,6 +50,7 @@ / {
        compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
index 2ff6cdf71a55b49043da937ff0064256e933c010..df2a9e6486a43472113435466bea38316950232e 100644 (file)
--- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts
+++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
@@ -17,6 +17,7 @@ / {
        compatible = "fsl,stmp378x-devb", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts
index db53089fb7fb8f24ed989e0d1b4e47b648144418..a6213c590f9469eba50cc9dc1ac0677d59d8dc5e 100644 (file)
--- a/arch/arm/boot/dts/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/imx23-xfi3.dts
@@ -49,6 +49,7 @@ / {
        compatible = "creative,x-fi3", "fsl,imx23";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index ea259927eef614a530a238273ec8fe97e37ab36e..8257630f7a4918e09b3b1d7c1664f2fc7b9a5cf8 100644 (file)
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -13,10 +13,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 {
                gpio0 = &gpio0;