| From a7f5dee22d511666176bc7ac65ba06add890b4a8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Apr 2021 15:37:49 +0200 |
| Subject: ARM: brcmstb: dts: fix NAND nodes names |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Rafał Miłecki <rafal@milecki.pl> |
| |
| [ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ] |
| |
| 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/bcm7445-bcm97445svmb.dts | 4 ++-- |
| arch/arm/boot/dts/bcm7445.dtsi | 2 +- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts |
| index 0bb8d17e4c2d..e51c9b079432 100644 |
| --- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts |
| +++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts |
| @@ -13,10 +13,10 @@ |
| }; |
| }; |
| |
| -&nand { |
| +&nand_controller { |
| status = "okay"; |
| |
| - nandcs@1 { |
| + nand@1 { |
| compatible = "brcm,nandcs"; |
| reg = <1>; |
| nand-ecc-step-size = <512>; |
| diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi |
| index 4791321969b3..3f002f2047f1 100644 |
| --- a/arch/arm/boot/dts/bcm7445.dtsi |
| +++ b/arch/arm/boot/dts/bcm7445.dtsi |
| @@ -149,7 +149,7 @@ |
| reg-names = "aon-ctrl", "aon-sram"; |
| }; |
| |
| - nand: nand@3e2800 { |
| + nand_controller: nand-controller@3e2800 { |
| status = "disabled"; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| -- |
| 2.30.2 |
| |