ARM: dts: imx28: Fix memory node duplication

Boards based on imx28 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx28.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/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts
index bab78346fa9f48883592bba7820b830af1e7101a..b6976fbec983eebb00dd4f99da033f86fc6c03f2 100644 (file)
--- a/arch/arm/boot/dts/imx28-apf28.dts
+++ b/arch/arm/boot/dts/imx28-apf28.dts
@@ -17,6 +17,7 @@
        compatible = "armadeus,imx28-apf28", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts
index 6c9b498305c05461fe79bbf2493b0cad01c69d46..3a184d13887bed41fe4ba391bb81aecdea16ce07 100644 (file)
--- a/arch/arm/boot/dts/imx28-apx4devkit.dts
+++ b/arch/arm/boot/dts/imx28-apx4devkit.dts
@@ -7,6 +7,7 @@
        compatible = "bluegiga,apx4devkit", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 8337ca21e28174a9a32174374497328b65e7a9db..d3e3622979c5bf9379dd0f3b9cd5ce55048975f9 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -17,6 +17,7 @@
        compatible = "crystalfontz,cfa10036", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-duckbill-2-485.dts b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
index f4f2b3d16c8e166d060bc45dc8aadd8e136e45bb..19957c2406e8c945be1478bf25b742a61f8e88b2 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2-485.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
@@ -20,6 +20,7 @@
        compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
index 71d0fcbc2d8c38295b7052bc4af2af4c3e316b00..498213137385e92c8d641334adb0f38be05cf5c6 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
@@ -21,6 +21,7 @@
        compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
index 6580ec6e26babee168acec5edf22c66e3721974e..d38d35b2a93d673e3fd912ae5a5de94f60caf5b5 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
@@ -24,6 +24,7 @@
        };
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-duckbill-2.dts b/arch/arm/boot/dts/imx28-duckbill-2.dts
index 693634edae99c9ffccf32aba3beccfa0784bd8cd..38160fbd44b6e0f88d7ec4665d4ea858018b8f96 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill-2.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2.dts
@@ -20,6 +20,7 @@
        compatible = "i2se,duckbill-2", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-duckbill.dts b/arch/arm/boot/dts/imx28-duckbill.dts
index 16f524428ed701c3bef7f8081357ce4afc3466ac..7139c07ae19b46e5c1ad153c5c0f3a342f51fa9d 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill.dts
+++ b/arch/arm/boot/dts/imx28-duckbill.dts
@@ -19,6 +19,7 @@
        compatible = "i2se,duckbill", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
index b70f3349c350ab54f5973b5ddc030f1b5c4d317f..28dab6d3a97cf053d6cd0316d1323b03ba54c59c 100644 (file)
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
@@ -24,6 +24,7 @@
        compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x04000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
index 65efb78ac0409a4e975f55aff59fca7a0506d5e2..7c3d55277312e4901bc70d270dfd0e668122efda 100644 (file)
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
@@ -23,6 +23,7 @@
        compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 5778300f44e8b7133a6b53a2d10e152338e8c052..96c1d106bc641ab57c0c62a408e7829be6cb386e 100644 (file)
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -10,6 +10,7 @@
        compatible = "fsl,imx28-evk", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi
index 0ec415e1ff58b74ddef575314f11f396d868b93a..298ad28caceb7683c9fa8d988177d00ae8afa815 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28.dtsi
+++ b/arch/arm/boot/dts/imx28-m28.dtsi
@@ -16,6 +16,7 @@
        compatible = "aries,m28", "denx,m28", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts
index 8883d36a51b5218b14090fe7c77af5d0ea964852..ece33103a5171820fb7034174b4271480fc143cf 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28cu3.dts
+++ b/arch/arm/boot/dts/imx28-m28cu3.dts
@@ -17,6 +17,7 @@
        compatible = "msr,m28cu3", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 893886d17b2da82e759c2790d3e2e626e65d36db..7d64301529c76dd611521f36c3b2e95c749666f2 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -1,4 +1,5 @@
 /*
+
  * Copyright (C) 2012 Marek Vasut <marex@denx.de>
  *
  * The code contained herein is licensed under the GNU General Public

diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
index ea9212f6ecdad5e0a3e8c345cb61ce4c5689d0c7..42c88a67912b5c2b000ad1ff31073243214596b1 100644 (file)
--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -17,6 +17,7 @@
        compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx28-ts4600.dts b/arch/arm/boot/dts/imx28-ts4600.dts
index dccdd6bcd0b2ba95d3216f90dadba52075395fb3..e3fd4112e64223ad5a1ea112a90ae4df74cc4c1e 100644 (file)
--- a/arch/arm/boot/dts/imx28-ts4600.dts
+++ b/arch/arm/boot/dts/imx28-ts4600.dts
@@ -20,6 +20,7 @@
        compatible = "technologic,imx28-ts4600", "fsl,imx28";
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0x10000000>;   /* 256MB */
        };
 

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index b8f46432e2a21150e1ce2fd4c327e4ac414ed31c..164254c28f8eb7e1a1308ae056cea188a4c96258 100644 (file)
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -66,6 +66,7 @@
        };
 
        memory@40000000 {
+               device_type = "memory";
                reg = <0x40000000 0>; /* will be filled in by U-Boot */
        };
 

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 2b7efb659fc0b8325375d5c8b77a6f56b9846dce..e14d8ef0158b8200759167b5775f07c0d2f2fb9d 100644 (file)
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -14,10 +14,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 = &mac0;