ARM: dts: imx6ul: Fix memory node duplication

Boards based on imx6ul have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx6ul.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/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
index 32a07232c0345ae3a275e50dac3d095fe9acd017..8180211265592f868d80203dcc737001fdcee6c0 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
@@ -12,6 +12,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index e22ec5be2b78f8a9758cbadf234f876482872508..bc77f26a2f1dee7ccaf5141ea6c4f6eea751cad2 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -15,6 +15,7 @@
        compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x08000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index b1fa3f0a684d0feb9fcf901b1c166f8bf3f51bc7..213e802bf35c5dc1a5a6162eae28917d2acd30ca 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -10,6 +10,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi
index 8f775f6974d1ceb01b426b1cd80edfad5f707b80..8d6893210842bed98518f7fd862f1bcb2d23c863 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-litesom.dtsi
+++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi
@@ -48,6 +48,7 @@
        compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
index a031bee311df4e7134c5715f2f4754291a372f9b..cf7faf4b9c47ef76f5c537bb1e6e894e4122b4fe 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -49,6 +49,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0>; /* will be filled by U-Boot */
        };
 

diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 0c09420f995125d49bba630931185a179a40020d..797262d2f27fdbdd1f3098282ebafd5a8615cf2b 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -53,6 +53,7 @@
 
        /* Will be filled by the bootloader */
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0>;
        };
 

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 02b5ba42cd5911cdc95f61987d0641aed6e37039..bb6dbfd5546b4b178cc31626b6d66ef42417e107 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -71,6 +71,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0>; /* will be filled by U-Boot */
        };
 

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index c71d2d648c2e87bf3cae850be1a8e50b2f5c5e8a..99c366303d739651be5bd7cd7a43741d919b22b5 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -15,10 +15,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 = &fec1;

diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index 10ab4697950f51e001a8c483e09e9c8cd0240c27..fb213bec465435a80d1ab44f71592cba1aee71ba 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -7,6 +7,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 183193e8580dd12a99f1d14d365fceff892e0853..038d8c90f6dfeafd52cba37b3d5c076bbc67320e 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -7,6 +7,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };