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 e895f7cb8c9f261171e616abf49a4f9dbf2d0136..605b6d2f4a569c8b858396866f8a25ea50d133b9 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -269,7 +269,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 7be4c4e628e024b62df1782414d6037d45b6fde2..5dd1001255c6415ae714eab010a4766b825e403a 100644 (file)
--- a/arch/arm/boot/dts/bcm958522er.dts
+++ b/arch/arm/boot/dts/bcm958522er.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/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts
index e58ed7e95346040752f373e19f704baca7ae1f10..0e624c57b5854d4f3d7980a050832d20f7377033 100644 (file)
--- a/arch/arm/boot/dts/bcm958525er.dts
+++ b/arch/arm/boot/dts/bcm958525er.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/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts
index 21f922dc60196b1d49aedcfca4cf4cd9063d8f47..2ac6d61ad297e4ddc48ed88fd338bf77ec0e05cf 100644 (file)
--- a/arch/arm/boot/dts/bcm958525xmc.dts
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
@@ -90,8 +90,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 a49c2fd21f4a895e13cdd1ce2900e6cec8056c40..e072fa83537a1f6c2d1a6afdcb7127ec3c9a9f3c 100644 (file)
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -78,8 +78,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 dd6dff6452b87415a0cfc3afdd27952303272aad..835f4765efbc1d0704c7c3d40758305cbf28b39d 100644 (file)
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -78,8 +78,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 a71371b4065ed7eefe0e3bfca202b959b2396e52..57974b8fab86fb9584e85f4f5b59389700f8a470 100644 (file)
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -89,8 +89,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 7782b61c51a16dc4e841d5a058b46fc73821e33f..45a043ea77ce58d4dd103d8b1b1ccbe74306b11d 100644 (file)
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -68,8 +68,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;