ARM: Cygnus: dts: fix NAND nodes names

[ Upstream commit e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ]

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/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 887a60c317e9dfae7f3bd68c907abc099b1e07ff..56f43a9f603d883b4a067a383dcfd3793d2d9053 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -455,7 +455,7 @@
                        status = "disabled";
                };
 
-               nand: nand@18046000 {
+               nand_controller: nand-controller@18046000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x18046000 0x600>, <0xf8105408 0x600>,
                              <0x18046f00 0x20>;

diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index 53f990defd6ae9f7af35eac9e1a04a16ae47c048..423a29a46b771060eadb66338c095ca220e731b2 100644 (file)
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -84,8 +84,8 @@
        status = "okay";
 };
 
-&nand {
-       nandcs@1 {
+&nand_controller {
+       nand@1 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;

diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
index b4a1392bd5a6c6f2b59761164171242188539d90..dda3e11b711f65c8f6c220519613654c8ae8ec70 100644 (file)
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -60,8 +60,8 @@
        status = "okay";
 };
 
-&nand {
-       nandcs@1 {
+&nand_controller {
+       nand@1 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;

diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts
index 3378683321d3c88dcb0edab34a05cfe546cc5ac2..ea3c6b88b313b21160c332533644eaa196bfd13b 100644 (file)
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -68,8 +68,8 @@
        status = "okay";
 };
 
-&nand {
-       nandcs@1 {
+&nand_controller {
+       nand@1 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;