ARM: brcmstb: dts: fix NAND nodes names

BugLink: https://bugs.launchpad.net/bugs/1939442
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
index 8313b7cad542732145c954e29ca41f12b5e01ce2..f92d2cf859726910d4e83ba8678e44a6392af724 100644 (file)
--- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
+++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -14,10 +14,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 58f67c9b830b85e5eaa6ccf35fc45b6d0c4ec22e..5ac2042515b8f5a9156c47f18f0bb42fdbb2772b 100644 (file)
--- a/arch/arm/boot/dts/bcm7445.dtsi
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -148,7 +148,7 @@
                        reg-names = "aon-ctrl", "aon-sram";
                };
 
-               nand: nand@3e2800 {
+               nand_controller: nand-controller@3e2800 {
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;