]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: BCM63xx: Fix NAND nodes names
authorRafał Miłecki <rafal@milecki.pl>
Fri, 16 Apr 2021 13:37:52 +0000 (15:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Jul 2021 07:12:33 +0000 (09:12 +0200)
[ 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>
arch/arm/boot/dts/bcm63138.dtsi
arch/arm/boot/dts/bcm963138dvt.dts

index 34cd6405125096e4cd9d830d30487d11c9ff7765..84efc3d16f5850c248a4d110cecb5a1b21f09ee5 100644 (file)
                        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";
index 370aa2cfddf207293a0642e4dce9c9880e7a4e25..439cff69e948f3bb9903d9a9c69fc5c4d5e057df 100644 (file)
        status = "okay";
 };
 
-&nand {
+&nand_controller {
        status = "okay";
 
-       nandcs@0 {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-ecc-strength = <4>;