ARM: dts: imx27: Fix memory node duplication

[ Upstream commit 38715dcd49b4430ac5b6bc1293278d91a4d32bd5 ]

Boards based on imx27 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx27.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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 3eddd805a793a3614c9f4fdd14483c93c9081a76..f635d5c5029c4443f845f231f357f1630303324d 100644 (file)
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -20,6 +20,7 @@
        compatible = "armadeus,imx27-apf27", "fsl,imx27";
 
        memory@a0000000 {
+               device_type = "memory";
                reg = <0xa0000000 0x04000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
index 9c455dcbe6ebf9b3c30d3d05d9a1e76291bf0f8d..c85f9d01768a105b48fb38cae6d077c62bf16845 100644 (file)
--- a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
+++ b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
@@ -17,6 +17,7 @@
        compatible = "eukrea,cpuimx27", "fsl,imx27";
 
        memory@a0000000 {
+               device_type = "memory";
                reg = <0xa0000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index f9a882d99132918b5f0bc364eec2f093d717c678..35123b7cb6b3ed87e72679e8dcdfd4dde532e9ac 100644 (file)
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -10,6 +10,7 @@
        compatible = "fsl,imx27-pdk", "fsl,imx27";
 
        memory@a0000000 {
+               device_type = "memory";
                reg = <0xa0000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
index cbad7c88c58cc60f59a3dfac35aabe8e6e8ddee0..b0b4f7c00246d7769939f1cca739302d714bea8a 100644 (file)
--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
@@ -18,6 +18,7 @@
        compatible = "phytec,imx27-pca100", "fsl,imx27";
 
        memory@a0000000 {
+               device_type = "memory";
                reg = <0xa0000000 0x08000000>; /* 128MB */
        };
 };

diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index ec466b4bfd4107d61e7f754bc4879ed94ca17fb0..0935e1400e5d29f661bc6fecaade83d1c1af0aaa 100644 (file)
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -17,6 +17,7 @@
        compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
        memory@a0000000 {
+               device_type = "memory";
                reg = <0xa0000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 753d88df1627405953c75116599c7235bd39095b..39e75b997bdc8157d42346ec32b0c7a789bb7f97 100644 (file)
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.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;