ipq806x: use correct definition for nand-controller node

From kernel Documentation this should be called nand-controller

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 02f60c90eeee718c763051ae789b3698c5db68ae..ec4535b55f7f28d0157733f90a6628446644a105 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -144,7 +144,7 @@
 
                cs-gpios = <&qcom_pinmux 20 0>;
 
-               flash: m25p80@0 {
+               m25p80@0 {
                        compatible = "s25fl256s1";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -175,13 +175,13 @@
        force_gen1 = <1>;
 };
 
-&nand {
+&nand_controller {
        status = "okay";
 
        pinctrl-0 = <&nand_pins>;
        pinctrl-names = "default";
 
-       cs0 {
+       nand@0 {
                reg = <0>;
                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index de347643dc9a6dfadd75913ecc27a586b7b20f95..5b181075c760830bd5d2a57d36e97ff5db8e9c66 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -121,7 +121,7 @@
 
                                cs-gpios = <&qcom_pinmux 20 0>;
 
-                               flash: m25p80@0 {
+                               m25p80@0 {
                                        compatible = "s25fl256s1";
                                        #address-cells = <1>;
                                        #size-cells = <1>;
@@ -164,13 +164,13 @@
                        status = "okay";
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index d90518bf22ffb5c4524782ef4f08c90c41ecc2a1..0c3d8192b4afef7422c68d1f4d692f931952abd2 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -157,7 +157,7 @@
 
                                cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
 
-                               flash: m25p80@0 {
+                               m25p80@0 {
                                        compatible = "jedec,spi-nor";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 241c00962a56af9fbf7a266dd84531b729a7344f..c3d8fab652706727861618a36c1bf2cd6ca0a534 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -184,7 +184,7 @@
                        force_gen1 = <1>;
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
@@ -193,7 +193,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
index 5da523a728184b49bf86077eb0c4af00d63dd7a8..9d14b6583497f316c81904300baddd2f0f7daec2 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
@@ -79,7 +79,7 @@
 
                                cs-gpios = <&qcom_pinmux 20 0>;
 
-                               flash: m25p80@0 {
+                               m25p80@0 {
                                        compatible = "s25fl256s1";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index b052ca6fcb1713598230f41f961be3f89546dbce..5cc4cf31d191bf3fecf931874ee2a893cf46967c 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -155,13 +155,13 @@
                        status = "okay";
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index dd596f52b440a2aa4d57fd166686ad9aa87f2e6e..f0909d1a8f61e625fa97c969800d960a98a1cb7b 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -154,13 +154,13 @@
                        force_gen1 = <1>;
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 463c0abb40153101c4fd61d2a3ddf5661f132cbe..da67e36c6bb463d408fb73613990ed47e3c7c5f3 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -188,13 +188,13 @@
                        force_gen1 = <1>;
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index bdcd302802f6a6a3f799a03fd5cf29a21d6c148b..afccef5fa2ed57cf2186767d30501dcc1f5d1545 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -135,7 +135,7 @@
 
                                cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
 
-                               flash: W25Q128@0 {
+                               W25Q128@0 {
                                        compatible = "jedec,spi-nor";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index a1e7791d12df7228e677896abb39be68a974b77c..c409b2d6599bb8f303907a98fc845f52f4edc06e 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -62,7 +62,7 @@
                        pinctrl-names = "default";
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index b4770102e272ccf421702745a6371437595c1713..21dfc9e9ebc7d80b18c81804928352353b6d6e24 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -38,7 +38,7 @@
        };
 
        soc {
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 378ea775b541efd3a7ca656830907f85a0f21868..acecf9d3fa2e3900c616ae581ee334e5e363027b 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -175,7 +175,7 @@
 
                                cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
 
-                               flash: m25p80@0 {
+                               m25p80@0 {
                                        compatible = "jedec,spi-nor";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index f93039f7272d164cbb755398e37dfef386199a97..0af9e2746a68dc73e4902a6882a508b370bf9700 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -281,13 +281,13 @@
                        };
                };
 
-               nand@1ac00000 {
+               nand-controller@1ac00000 {
                        status = "okay";
 
                        pinctrl-0 = <&nand_pins>;
                        pinctrl-names = "default";
 
-                       cs0 {
+                       nand@0 {
                                reg = <0>;
                                compatible = "qcom,nandcs";