ARM: NSP: dts: fix NAND nodes names

This matches nand-controller.yaml requirements.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index b4d2cc70afb193968fb47d6574fc4ad0b81870c3..748df7955ae67f1f85458adcf15b4391fd8ccb3e 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 5443fc079e6e4f50ebfb7e138f95dc75552a7460..1f73885ec274a38eb08d1c1d18a152840ffc1e57 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 e1e3c26cef1909fbe422c09bb0fcd0d8a0300234..b6b9ca8b097264a7e194d3f56824151d00e0582f 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 f161ba2e7e5e112a65d1700628eac3b6f2397e3b..ecf426f6ad5d557f9806ab0eca34ab93872122cc 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 83cb877d63dbcc3fbde211d1b69860ee938a2c8e..8ca18da981adfe53de316755fceedbf0e9ec9f7a 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 4e106ce1384a3e7760292cb2bfb52994136335e1..9747378db5314f9d7f2ed1dd730a34af939cd2d1 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 cda6cc281e186b93d3d3c7f4f8ccb64a7e557592..0f92b773afb8d3353c0095a3feb919d9bfa45212 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 ffbff0014c6527e15d6d6430d5549ef5afd3053c..9e984ca0e6df420b2ad0c51b7098f873807f9159 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 3fd39c479a3ce3e8d982fb25e2113e6f89782906..5475dab8181d2f0f12259c80afd86a6014e02716 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;