lkml.org 
[lkml]   [2021]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 14/51] ARM: Cygnus: dts: fix NAND nodes names
    Date
    From: Rafał Miłecki <rafal@milecki.pl>

    [ Upstream commit e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ]

    This matches nand-controller.yaml requirements.

    Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +-
    arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++--
    arch/arm/boot/dts/bcm958300k.dts | 4 ++--
    arch/arm/boot/dts/bcm958305k.dts | 4 ++--
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
    index 1bc45cfd5453..9ca7b4241c97 100644
    --- a/arch/arm/boot/dts/bcm-cygnus.dtsi
    +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
    @@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 {
    status = "disabled";
    };

    - nand: nand@18046000 {
    + nand_controller: nand-controller@18046000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
    reg = <0x18046000 0x600>, <0xf8105408 0x600>,
    <0x18046f00 0x20>;
    diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
    index b2d323f4a5ab..a76c74b44bba 100644
    --- a/arch/arm/boot/dts/bcm911360_entphn.dts
    +++ b/arch/arm/boot/dts/bcm911360_entphn.dts
    @@ -82,8 +82,8 @@ &uart3 {
    status = "okay";
    };

    -&nand {
    - nandcs@1 {
    +&nand_controller {
    + nand@1 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
    index b4a1392bd5a6..dda3e11b711f 100644
    --- a/arch/arm/boot/dts/bcm958300k.dts
    +++ b/arch/arm/boot/dts/bcm958300k.dts
    @@ -60,8 +60,8 @@ &uart3 {
    status = "okay";
    };

    -&nand {
    - nandcs@1 {
    +&nand_controller {
    + nand@1 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts
    index 3378683321d3..ea3c6b88b313 100644
    --- a/arch/arm/boot/dts/bcm958305k.dts
    +++ b/arch/arm/boot/dts/bcm958305k.dts
    @@ -68,8 +68,8 @@ &uart3 {
    status = "okay";
    };

    -&nand {
    - nandcs@1 {
    +&nand_controller {
    + nand@1 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-14 22:10    [W:4.352 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site