ARM: dts: vf: Fix memory node duplication

Boards based on vf500/vf600 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the vf500.dtsi/vf610m4.dtsi files.

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>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi b/arch/arm/boot/dts/vf500-colibri.dtsi
index 2e7e3cebba1ca46559aaad078f0a14292786d64d..237b0246fa84a5fa2fe716cbd37f20b3bd616436 100644 (file)
--- a/arch/arm/boot/dts/vf500-colibri.dtsi
+++ b/arch/arm/boot/dts/vf500-colibri.dtsi
@@ -47,6 +47,7 @@
        compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index 76a0949df4a88b6693e769563b8393dc3506b32d..b0ec475017ad90c9d048211ffd50ee0b9aae7cb3 100644 (file)
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -10,7 +10,6 @@
        #size-cells = <1>;
        chosen { };
        aliases { };
-       memory { device_type = "memory"; };
 
        cpus {
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/vf610-bk4.dts b/arch/arm/boot/dts/vf610-bk4.dts
index cab95714c0588473d4a7e56467947c5c85f1a8e6..689c8930dce35ceb9b54f94d796ce3283e4be482 100644 (file)
--- a/arch/arm/boot/dts/vf610-bk4.dts
+++ b/arch/arm/boot/dts/vf610-bk4.dts
@@ -16,6 +16,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi
index aeaf99f1f0fcd5db45eca102134d38b7f14ce149..05c9a39509b83f8ecbad8df83b51ef2530ee278a 100644 (file)
--- a/arch/arm/boot/dts/vf610-colibri.dtsi
+++ b/arch/arm/boot/dts/vf610-colibri.dtsi
@@ -47,6 +47,7 @@
        compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 };

diff --git a/arch/arm/boot/dts/vf610-cosmic.dts b/arch/arm/boot/dts/vf610-cosmic.dts
index a3014e8d97a9f13cb83fa377899cb46cb25ef0f4..ea1b996a6bca79d8909ea4077d7f4e361167df73 100644 (file)
--- a/arch/arm/boot/dts/vf610-cosmic.dts
+++ b/arch/arm/boot/dts/vf610-cosmic.dts
@@ -20,6 +20,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index 59fceea8805d83186eb6c3ca9ed39543ba4b806a..dbb5ffcdcec4388fc5173f213c1694f86f401893 100644 (file)
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -14,6 +14,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x8000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts
index b76c3d0413df0eec54f5716bc54918f47f9f6faf..7cdcc5fe8282cf92ee8134b8a9657bec91b3abf6 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts
@@ -16,6 +16,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index 5ae5abfe1d55e50ffa066b26697e85416555bde6..19eb4a849efb45d9d7f14f27b7373644ea7bbac5 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -50,6 +50,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
index fe357668865bbcc8e7c03f58bffb4c90454ad40d..757af56e8ee735c97dd14f9781992af5e16b311f 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
+++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
@@ -24,6 +24,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts
index 41ec66a969907d492dabec284e6a101f592e0216..607c6026736495c2348fb84679d960009e7b8734 100644 (file)
--- a/arch/arm/boot/dts/vf610m4-colibri.dts
+++ b/arch/arm/boot/dts/vf610m4-colibri.dts
@@ -55,6 +55,7 @@
        };
 
        memory@8c000000 {
+               device_type = "memory";
                reg = <0x8c000000 0x3000000>;
        };
 };

diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
index 8293276b55a641b30a2909155c0c900c99ca8be4..76bbfd5e32b699fb672520c8dce0c80da6d426bb 100644 (file)
--- a/arch/arm/boot/dts/vf610m4.dtsi
+++ b/arch/arm/boot/dts/vf610m4.dtsi
@@ -50,7 +50,6 @@
        #size-cells = <1>;
        chosen { };
        aliases { };
-       memory { device_type = "memory"; };
 };
 
 &mscm_ir {