lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 102/352] ARM: dts: aspeed: add missing memory unit-address
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]

    The base aspeed-g5.dtsi already defines a '/memory@80000000' node, so
    '/memory' in the board files create a duplicate node. We're probably
    getting lucky that the bootloader fixes up the memory node that the
    kernel ends up using. Add the unit-address so it's merged with the base
    node.

    Found with DT json-schema checks.

    Cc: Joel Stanley <joel@jms.id.au>
    Cc: Andrew Jeffery <andrew@aj.id.au>
    Cc: devicetree@vger.kernel.org
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: linux-aspeed@lists.ozlabs.org
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +-
    arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +-
    arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +--
    arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +-
    4 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
    index df1227613d48..c2ece0b91885 100644
    --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
    +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
    @@ -13,7 +13,7 @@
    bootargs = "console=ttyS4,115200 earlyprintk";
    };

    - memory {
    + memory@80000000 {
    reg = <0x80000000 0x40000000>;
    };

    diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
    index 7a291de02543..22dade6393d0 100644
    --- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
    +++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
    @@ -13,7 +13,7 @@
    bootargs = "earlyprintk";
    };

    - memory {
    + memory@80000000 {
    reg = <0x80000000 0x20000000>;
    };

    diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
    index d598b6391362..024e52a6cd0f 100644
    --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
    +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
    @@ -14,7 +14,7 @@
    bootargs = "console=ttyS4,115200 earlyprintk";
    };

    - memory {
    + memory@80000000 {
    reg = <0x80000000 0x40000000>;
    };

    @@ -322,4 +322,3 @@
    &adc {
    status = "okay";
    };
    -
    diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
    index 43ed13963d35..33d704541de6 100644
    --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
    +++ b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
    @@ -17,7 +17,7 @@
    bootargs = "console=ttyS4,115200 earlyprintk";
    };

    - memory {
    + memory@80000000 {
    reg = <0x80000000 0x20000000>;
    };

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:26    [W:4.093 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site