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

    [ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ]

    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-nsp.dtsi | 2 +-
    arch/arm/boot/dts/bcm958522er.dts | 4 ++--
    arch/arm/boot/dts/bcm958525er.dts | 4 ++--
    arch/arm/boot/dts/bcm958525xmc.dts | 4 ++--
    arch/arm/boot/dts/bcm958622hr.dts | 4 ++--
    arch/arm/boot/dts/bcm958623hr.dts | 4 ++--
    arch/arm/boot/dts/bcm958625hr.dts | 4 ++--
    arch/arm/boot/dts/bcm958625k.dts | 4 ++--
    arch/arm/boot/dts/bcm988312hr.dts | 4 ++--
    9 files changed, 17 insertions(+), 17 deletions(-)

    diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
    index b4d2cc70afb1..748df7955ae6 100644
    --- a/arch/arm/boot/dts/bcm-nsp.dtsi
    +++ b/arch/arm/boot/dts/bcm-nsp.dtsi
    @@ -269,7 +269,7 @@
    dma-coherent;
    };

    - nand: nand@26000 {
    + nand_controller: nand-controller@26000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
    reg = <0x026000 0x600>,
    <0x11b408 0x600>,
    diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts
    index 5443fc079e6e..1f73885ec274 100644
    --- a/arch/arm/boot/dts/bcm958522er.dts
    +++ b/arch/arm/boot/dts/bcm958522er.dts
    @@ -74,8 +74,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts
    index e1e3c26cef19..b6b9ca8b0972 100644
    --- a/arch/arm/boot/dts/bcm958525er.dts
    +++ b/arch/arm/boot/dts/bcm958525er.dts
    @@ -74,8 +74,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts
    index f161ba2e7e5e..ecf426f6ad5d 100644
    --- a/arch/arm/boot/dts/bcm958525xmc.dts
    +++ b/arch/arm/boot/dts/bcm958525xmc.dts
    @@ -90,8 +90,8 @@
    };
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts
    index 83cb877d63db..8ca18da981ad 100644
    --- a/arch/arm/boot/dts/bcm958622hr.dts
    +++ b/arch/arm/boot/dts/bcm958622hr.dts
    @@ -78,8 +78,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
    index 4e106ce1384a..9747378db531 100644
    --- a/arch/arm/boot/dts/bcm958623hr.dts
    +++ b/arch/arm/boot/dts/bcm958623hr.dts
    @@ -78,8 +78,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
    index cda6cc281e18..0f92b773afb8 100644
    --- a/arch/arm/boot/dts/bcm958625hr.dts
    +++ b/arch/arm/boot/dts/bcm958625hr.dts
    @@ -89,8 +89,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
    index ffbff0014c65..9e984ca0e6df 100644
    --- a/arch/arm/boot/dts/bcm958625k.dts
    +++ b/arch/arm/boot/dts/bcm958625k.dts
    @@ -68,8 +68,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
    index 3fd39c479a3c..5475dab8181d 100644
    --- a/arch/arm/boot/dts/bcm988312hr.dts
    +++ b/arch/arm/boot/dts/bcm988312hr.dts
    @@ -74,8 +74,8 @@
    status = "okay";
    };

    -&nand {
    - nandcs@0 {
    +&nand_controller {
    + nand@0 {
    compatible = "brcm,nandcs";
    reg = <0>;
    nand-on-flash-bbt;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:36    [W:4.083 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site