lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 054/321] ARM: dts: imx51: Fix memory node duplication
    Date
    From: Fabio Estevam <festevam@gmail.com>

    [ Upstream commit 6a9681168b83c62abfa457c709f2f4b126bd6b92 ]

    Boards based on imx51 have duplicate memory nodes:

    - One coming from the board dts file: memory@

    - One coming from the imx51.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/imx51-apf51.dts | 1 +
    arch/arm/boot/dts/imx51-babbage.dts | 1 +
    arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 +
    arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 +
    arch/arm/boot/dts/imx51-ts4800.dts | 1 +
    arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 +
    arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 +
    arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 +
    arch/arm/boot/dts/imx51.dtsi | 2 --
    9 files changed, 8 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
    index 79d80036f74de..1eddf2908b3f2 100644
    --- a/arch/arm/boot/dts/imx51-apf51.dts
    +++ b/arch/arm/boot/dts/imx51-apf51.dts
    @@ -22,6 +22,7 @@
    compatible = "armadeus,imx51-apf51", "fsl,imx51";

    memory@90000000 {
    + device_type = "memory";
    reg = <0x90000000 0x20000000>;
    };

    diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
    index ba60b0cb3cc13..99191466a8085 100644
    --- a/arch/arm/boot/dts/imx51-babbage.dts
    +++ b/arch/arm/boot/dts/imx51-babbage.dts
    @@ -15,6 +15,7 @@
    };

    memory@90000000 {
    + device_type = "memory";
    reg = <0x90000000 0x20000000>;
    };

    diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
    index 5761a66e8a0d3..82d8df097ef1f 100644
    --- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
    +++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
    @@ -17,6 +17,7 @@
    compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";

    memory@90000000 {
    + device_type = "memory";
    reg = <0x90000000 0x08000000>;
    };
    };
    diff --git a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
    index f8902a338e49a..2e3125391bc49 100644
    --- a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
    +++ b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
    @@ -23,6 +23,7 @@
    compatible = "eukrea,cpuimx51", "fsl,imx51";

    memory@90000000 {
    + device_type = "memory";
    reg = <0x90000000 0x10000000>; /* 256M */
    };
    };
    diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
    index 39eb067904c3d..4344632f79400 100644
    --- a/arch/arm/boot/dts/imx51-ts4800.dts
    +++ b/arch/arm/boot/dts/imx51-ts4800.dts
    @@ -18,6 +18,7 @@
    };

    memory@90000000 {
    + device_type = "memory";
    reg = <0x90000000 0x10000000>;
    };

    diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
    index 3fb66ddfe93a5..9235fd45a824e 100644
    --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
    +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
    @@ -53,6 +53,7 @@

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

    diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
    index 26cf08549df40..f5b2d768fe47f 100644
    --- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
    +++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
    @@ -18,6 +18,7 @@

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

    diff --git a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
    index e6ebac8f43e4f..ad90d66ccca6c 100644
    --- a/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
    +++ b/arch/arm/boot/dts/imx51-zii-scu3-esb.dts
    @@ -18,6 +18,7 @@

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

    diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
    index ef2abc0978439..81f60c96a2e41 100644
    --- a/arch/arm/boot/dts/imx51.dtsi
    +++ b/arch/arm/boot/dts/imx51.dtsi
    @@ -16,10 +16,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-12-03 23:47    [W:4.516 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site