ARM: dts: BCM5301X: Fix NAND nodes names

[ Upstream commit b660269cba748dfd07eb5551a88ff34d5ea0b86e ]

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/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
index 8636600385fd41a7497bc99652eb41da8ed30227..c81944cd6d0bb394ca532a260a5ac81044726972 100644 (file)
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
@@ -24,8 +24,8 @@
                reg = <0x00000000 0x08000000>;
        };
 
-       nand: nand@18028000 {
-               nandcs@0 {
+       nand_controller: nand-controller@18028000 {
+               nand@0 {
                        partitions {
                                compatible = "fixed-partitions";
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
index e635a15041dd8c133ec773f9c5b99f2f135c4b35..a6e2aeb286754c38bfb90e5b29655d7b065f5141 100644 (file)
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
@@ -25,8 +25,8 @@
                      <0x88000000 0x08000000>;
        };
 
-       nand: nand@18028000 {
-               nandcs@0 {
+       nand_controller: nand-controller@18028000 {
+               nand@0 {
                        partitions {
                                compatible = "fixed-partitions";
                                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
index 925a7c9ce5b7f42bdd21525b566bd3bc5c7aa240..be9a00ff752d9a353d09370aa2d860a8118b8e47 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
@@ -6,8 +6,8 @@
  */
 
 / {
-       nand@18028000 {
-               nandcs: nandcs@0 {
+       nand-controller@18028000 {
+               nandcs: nand@0 {
                        compatible = "brcm,nandcs";
                        reg = <0>;
                        #address-cells = <1>;

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 86872e12c355ee2720bbfe18b48cc8f8114b578e..bf595269ed7fadf6145a1966dc1ccf8639ddc378 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -501,7 +501,7 @@
                reg = <0x18004000 0x14>;
        };
 
-       nand: nand@18028000 {
+       nand_controller: nand-controller@18028000 {
                compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
                reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
                reg-names = "nand", "iproc-idm", "iproc-ext";

diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts
index 046c59fb48462135d27b45bb0253af1af7c6ed76..de40bd59a5faf3116a38e61d8c7e34da11fa82dc 100644 (file)
--- a/arch/arm/boot/dts/bcm953012k.dts
+++ b/arch/arm/boot/dts/bcm953012k.dts
@@ -49,8 +49,8 @@
        };
 };
 
-&nand {
-       nandcs@0 {
+&nand_controller {
+       nand@0 {
                compatible = "brcm,nandcs";
                reg = <0>;
                nand-on-flash-bbt;

diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
index 8060178b365d860c283c6b96d6b75b0fe94398e1..a5a64d17d9ea6d9d74c7bb6f4933a38d5df8b69a 100644 (file)
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
@@ -306,7 +306,7 @@
                        interrupt-names = "nand";
                        status = "okay";
 
-                       nandcs: nandcs@0 {
+                       nandcs: nand@0 {
                                compatible = "brcm,nandcs";
                                reg = <0>;
                        };