ARM: NSP: dts: fix NAND nodes names

[ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ]

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-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 8615d89fa46906e47a05df1f48fd34eee128debe..43ff85d31dc1215a959d6c2c86edda6028b55ca5 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -267,7 +267,7 @@
                        dma-coherent;
                };
 
-               nand: nand@26000 {
+               nand_controller: nand-controller@26000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x026000 0x600>,
                              <0x11b408 0x600>,

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

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

diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts
index 1c72ec8288de4d945164c448937c73e293750e69..17e6a683e678a7c8e1b9034cd5564da4aa6b9954 100644 (file)
--- a/arch/arm/boot/dts/bcm958525xmc.dts
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
@@ -86,8 +86,8 @@
        };
 };
 
-&nand {
-       nandcs@0 {
+&nand_controller {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;

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

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

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

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

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