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 066/321] ARM: dts: imx25: Fix memory node duplication
    Date
    From: Fabio Estevam <festevam@gmail.com>

    [ Upstream commit 59d8bb363f563e4a147a291037bf979cb8ff9a59 ]

    Boards based on imx25 have duplicate memory nodes:

    - One coming from the board dts file: memory@

    - One coming from the imx25.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/imx25-eukrea-cpuimx25.dtsi | 1 +
    arch/arm/boot/dts/imx25-karo-tx25.dts | 1 +
    arch/arm/boot/dts/imx25-pdk.dts | 1 +
    arch/arm/boot/dts/imx25.dtsi | 2 --
    4 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
    index e316fe08837a3..e4d7da267532d 100644
    --- a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
    +++ b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
    @@ -18,6 +18,7 @@
    compatible = "eukrea,cpuimx25", "fsl,imx25";

    memory@80000000 {
    + device_type = "memory";
    reg = <0x80000000 0x4000000>; /* 64M */
    };
    };
    diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
    index 5cb6967866c0a..f37e9a75a3ca7 100644
    --- a/arch/arm/boot/dts/imx25-karo-tx25.dts
    +++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
    @@ -37,6 +37,7 @@
    };

    memory@80000000 {
    + device_type = "memory";
    reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
    };
    };
    diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
    index a5626b46ac4e1..f8544a9e46330 100644
    --- a/arch/arm/boot/dts/imx25-pdk.dts
    +++ b/arch/arm/boot/dts/imx25-pdk.dts
    @@ -12,6 +12,7 @@
    compatible = "fsl,imx25-pdk", "fsl,imx25";

    memory@80000000 {
    + device_type = "memory";
    reg = <0x80000000 0x4000000>;
    };

    diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
    index 85c15ee632727..8c8ad80de4614 100644
    --- a/arch/arm/boot/dts/imx25.dtsi
    +++ b/arch/arm/boot/dts/imx25.dtsi
    @@ -12,10 +12,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:48    [W:4.215 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site