lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 009/219] ARM: dts: imx53: Fix memory node duplication
    Date
    From: Fabio Estevam <festevam@gmail.com>

    [ 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 | 1 +
    arch/arm/boot/dts/imx53-cx9020.dts | 1 +
    arch/arm/boot/dts/imx53-m53.dtsi | 1 +
    arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 +
    arch/arm/boot/dts/imx53-smd.dts | 1 +
    arch/arm/boot/dts/imx53-tqma53.dtsi | 1 +
    arch/arm/boot/dts/imx53-tx53.dtsi | 1 +
    arch/arm/boot/dts/imx53-usbarmory.dts | 1 +
    arch/arm/boot/dts/imx53.dtsi | 2 --
    9 files changed, 8 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
    index 117bd002dd1d1..7d5a48250f867 100644
    --- a/arch/arm/boot/dts/imx53-ard.dts
    +++ b/arch/arm/boot/dts/imx53-ard.dts
    @@ -19,6 +19,7 @@
    compatible = "fsl,imx53-ard", "fsl,imx53";

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x40000000>;
    };

    diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
    index cf70ebc4399a2..c875e23ee45fb 100644
    --- a/arch/arm/boot/dts/imx53-cx9020.dts
    +++ b/arch/arm/boot/dts/imx53-cx9020.dts
    @@ -22,6 +22,7 @@
    };

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x20000000>,
    <0xb0000000 0x20000000>;
    };
    diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
    index ce45f08e30514..db2e5bce9b6a1 100644
    --- a/arch/arm/boot/dts/imx53-m53.dtsi
    +++ b/arch/arm/boot/dts/imx53-m53.dtsi
    @@ -16,6 +16,7 @@
    compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x20000000>,
    <0xb0000000 0x20000000>;
    };
    diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
    index 50dde84b72ed7..f00dda334976a 100644
    --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
    +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
    @@ -11,6 +11,7 @@
    };

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x20000000>,
    <0xb0000000 0x20000000>;
    };
    diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
    index 462071c9ddd73..09071ca11c6cf 100644
    --- a/arch/arm/boot/dts/imx53-smd.dts
    +++ b/arch/arm/boot/dts/imx53-smd.dts
    @@ -12,6 +12,7 @@
    compatible = "fsl,imx53-smd", "fsl,imx53";

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x40000000>;
    };

    diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
    index a72b8981fc3bd..c77d58f06c949 100644
    --- a/arch/arm/boot/dts/imx53-tqma53.dtsi
    +++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
    @@ -17,6 +17,7 @@
    compatible = "tq,tqma53", "fsl,imx53";

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x40000000>; /* Up to 1GiB */
    };

    diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
    index 54cf3e67069a9..4ab135906949f 100644
    --- a/arch/arm/boot/dts/imx53-tx53.dtsi
    +++ b/arch/arm/boot/dts/imx53-tx53.dtsi
    @@ -51,6 +51,7 @@

    /* Will be filled by the bootloader */
    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0>;
    };

    diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
    index f6268d0ded296..ee6263d1c2d3d 100644
    --- a/arch/arm/boot/dts/imx53-usbarmory.dts
    +++ b/arch/arm/boot/dts/imx53-usbarmory.dts
    @@ -58,6 +58,7 @@
    };

    memory@70000000 {
    + device_type = "memory";
    reg = <0x70000000 0x20000000>;
    };

    diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
    index b6b0818343c4e..8accbe16b7584 100644
    --- a/arch/arm/boot/dts/imx53.dtsi
    +++ b/arch/arm/boot/dts/imx53.dtsi
    @@ -23,10 +23,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 = &fec;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-22 07:31    [W:4.174 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site