ARM: dts: imx25: Fix memory node duplication

Boards based on imx25 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx25.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/imx25-eukrea-cpuimx25.dtsi b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
index e316fe08837a3e551e8320ed0d08c8d71fdd07ff..e4d7da267532deafecebdd19c28613ea683e92de 100644 (file)
--- a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+++ b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
@@ -18,6 +18,7 @@ / {
        compatible = "eukrea,cpuimx25", "fsl,imx25";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x4000000>; /* 64M */
        };
 };

diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index 5cb6967866c0af7bf1c782686de695971def117b..f37e9a75a3ca7b3553ed1294906e47df4da6cf50 100644 (file)
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -37,6 +37,7 @@ reg_fec_phy: regulator@0 {
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index a5626b46ac4e11baf20eaf3d02bd3f1b32c78486..f8544a9e46330fd756395eaff80f7290dca4af44 100644 (file)
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -12,6 +12,7 @@ / {
        compatible = "fsl,imx25-pdk", "fsl,imx25";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x4000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index e80101847aff5ff897598b15e01dd49e81df239f..9a097ef014af5ffc0d87074144de5def3a162d4e 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -12,10 +12,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;