ARM: dts: BCM63xx: Fix NAND nodes names

[ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ]

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>

diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index 6df61518776f7e45ef8a290fd1920ab675ca649c..557098f5c8d536ccc5fd763c2c022e2d2c00bb48 100644 (file)
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -175,7 +175,7 @@
                        status = "disabled";
                };
 
-               nand: nand@2000 {
+               nand_controller: nand-controller@2000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";

diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts
index c61673638fa8a090c0a9688478a55e7952f2e1bb..5445fccec5a54e5de21934a438416dfbdaf3d894 100644 (file)
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -30,10 +30,10 @@
        status = "okay";
 };
 
-&nand {
+&nand_controller {
        status = "okay";
 
-       nandcs@0 {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-ecc-strength = <4>;