ARM: dts: imx7: Fix memory node duplication

[ Upstream commit 29988e867cb17de7119e971f9acfad2c3fccdb47 ]

Boards based on imx7 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx7s.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/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
index 584418f517a88228053a65c63a90758d891f3817..62d5e9a4a7818cf6648e5378d32d20eeaf6fed54 100644 (file)
--- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
+++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
@@ -19,6 +19,7 @@
        compatible = "compulab,cl-som-imx7", "fsl,imx7d";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */
        };
 
@@ -284,4 +285,4 @@
                        MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5     0x14 /* OTG PWREN */
                >;
        };
-};
\ No newline at end of file
+};

diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 04d24ee17b142f498fe781070f729cf8ad44490c..898f4b8d7421fbe50f6c58c00cdfd644c25a2f12 100644 (file)
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -8,6 +8,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index d9f8fb69511b6bd98e6aba5c047b833c1d276e77..e2e327f437e3569058378c8279d5be4faa22b587 100644 (file)
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -45,6 +45,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index 177d21fdeb288d3e458176ddf0d537a746f0d2ba..6b4acea1ef7955d4c07a68e7b3ea24014e05dcb8 100644 (file)
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -12,6 +12,7 @@
        compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
index f27b3849d3ff3ed91d7e2d504206c4c8a7d8045b..934a019f341e420dabb11785a6cb92c449819cb2 100644 (file)
--- a/arch/arm/boot/dts/imx7d-pico.dtsi
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -49,6 +49,7 @@
        compatible = "technexion,imx7d-pico", "fsl,imx7d";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index c9b3c60b0eb22fe3ac4f8ab05f1a17209e96ee5d..317f1bcc56e2a56cc64f90e57392babc33fc299a 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -15,6 +15,7 @@
        };
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index fe8344cee8641debe183a206e8db0afb78fa8a20..1fb1ec5d3d70717f08026f47e42d9bfee0c81ca8 100644 (file)
--- a/arch/arm/boot/dts/imx7s-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -45,6 +45,7 @@
 
 / {
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x10000000>;
        };
 };

diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index fa390da636de761fabe196c9c16e2b41b26ba41d..97d5c711eb0ca7dd6cd886ea2276a35ddade285c 100644 (file)
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -51,6 +51,7 @@
        compatible = "warp,imx7s-warp", "fsl,imx7s";
 
        memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 90f5bdfa9b3ce614b4bc61cfcd38585169c5f804..7eaf96b425bed4dc48fd647a598a0ce3923c9906 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -17,10 +17,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 {
                gpio0 = &gpio1;