OSDN Git Service

ARM: dts: imx53: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Mon, 5 Nov 2018 21:14:46 +0000 (19:14 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:50 +0000 (09:19 +0100)
[ Upstream commit e8fd17b900a4a1e3a8bef7b44727cbad35db05a7 ]

Boards based on imx53 have duplicate memory nodes:

- One coming from the board dts file: memory@

- One coming from the imx53.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>
arch/arm/boot/dts/imx53-ard.dts
arch/arm/boot/dts/imx53-cx9020.dts
arch/arm/boot/dts/imx53-m53.dtsi
arch/arm/boot/dts/imx53-qsb-common.dtsi
arch/arm/boot/dts/imx53-smd.dts
arch/arm/boot/dts/imx53-tqma53.dtsi
arch/arm/boot/dts/imx53-tx53.dtsi
arch/arm/boot/dts/imx53-usbarmory.dts
arch/arm/boot/dts/imx53.dtsi

index 117bd00..7d5a482 100644 (file)
@@ -19,6 +19,7 @@
        compatible = "fsl,imx53-ard", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>;
        };
 
index cf70ebc..c875e23 100644 (file)
@@ -22,6 +22,7 @@
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };
index ce45f08..db2e5bc 100644 (file)
@@ -16,6 +16,7 @@
        compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };
index 50dde84..f00dda3 100644 (file)
@@ -11,6 +11,7 @@
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>,
                      <0xb0000000 0x20000000>;
        };
index 462071c..09071ca 100644 (file)
@@ -12,6 +12,7 @@
        compatible = "fsl,imx53-smd", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>;
        };
 
index a72b898..c77d58f 100644 (file)
@@ -17,6 +17,7 @@
        compatible = "tq,tqma53", "fsl,imx53";
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x40000000>; /* Up to 1GiB */
        };
 
index 54cf3e6..4ab1359 100644 (file)
@@ -51,6 +51,7 @@
 
        /* Will be filled by the bootloader */
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0>;
        };
 
index f6268d0..ee6263d 100644 (file)
@@ -58,6 +58,7 @@
        };
 
        memory@70000000 {
+               device_type = "memory";
                reg = <0x70000000 0x20000000>;
        };
 
index b6b0818..8accbe1 100644 (file)
         * 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;