ARM: dts: imx: Change gpmi nand node name to nand-controller

Change i.MX SoCs nand node name from "gpmi-nand" to "nand-controller" to
be compliant with yaml schema, it requires the nodename to be
"nand-controller".

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index 0b2701ca29212c1d800a8ed04e0958c22507c54c..8cbaf1c8117456a11125de5f1f9986e1c9078e7d 100644 (file)
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -53,7 +53,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>;
                                status = "okay";

diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 18289f6fb1f3f2de5149d8e60d0ca1977fcc86dc..7f4c602454a5fb0721a34833f773c98ea0d1b155 100644 (file)
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -76,7 +76,7 @@
                                status = "disabled";
                        };
 
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                compatible = "fsl,imx23-gpmi-nand";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts
index 3ed2b328f7ef1711fa9df0b2d5e32d9e0f2496bc..14a92fe59770ffed566793b8033837802d97bf7b 100644 (file)
--- a/arch/arm/boot/dts/imx28-apf28.dts
+++ b/arch/arm/boot/dts/imx28-apf28.dts
@@ -17,7 +17,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
                                status = "okay";

diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts
index c5acc19c982d87269b78c61ba1d6ad75e1bb2de8..b86be320496b3efb9d697a328997b8d637b30118 100644 (file)
--- a/arch/arm/boot/dts/imx28-apx4devkit.dts
+++ b/arch/arm/boot/dts/imx28-apx4devkit.dts
@@ -13,7 +13,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
                                status = "okay";

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 96c1d106bc641ab57c0c62a408e7829be6cb386e..7e2b0f198dfadb801f350ee9282cc6c73bcea210 100644 (file)
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -97,7 +97,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg
                                             &gpmi_pins_evk>;

diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts
index 91bd6deffee5178eaa5a1346dab831b42d606b43..865ac3d573c798635328c0991709ec3c942ebeee 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28cu3.dts
+++ b/arch/arm/boot/dts/imx28-m28cu3.dts
@@ -17,7 +17,7 @@
 
        apb@80000000 {
                apbh@80000000 {
-                       gpmi-nand@8000c000 {
+                       nand-controller@8000c000 {
                                #address-cells = <1>;
                                #size-cells = <1>;
                                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index a2b799c56f8fb02487d731bef4be14a2c3d92f4a..94dfbf5b3f34afd8f6a14ccc4ccd7d2a20b9e144 100644 (file)
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -100,7 +100,7 @@
                                status = "disabled";
                        };
 
-                       gpmi: gpmi-nand@8000c000 {
+                       gpmi: nand-controller@8000c000 {
                                compatible = "fsl,imx28-gpmi-nand";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 43edbf1156c75c1c7e9c02d9a0580053250efa77..de6daa7b38aa1037cbf971d5e81b0b4cc2b147a3 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -159,7 +159,7 @@
                        clocks = <&clks IMX6QDL_CLK_APBH_DMA>;
                };
 
-               gpmi: gpmi-nand@112000 {
+               gpmi: nand-controller@112000 {
                        compatible = "fsl,imx6q-gpmi-nand";
                        reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
                        reg-names = "gpmi-nand", "bch";

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index b480dfa9e251a1744d4bbf4aa99c37f82a626f89..dfdca1804f9f81ee7b1b4d5dd1363d64d3e17f45 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -213,7 +213,7 @@
                        clocks = <&clks IMX6SX_CLK_APBH_DMA>;
                };
 
-               gpmi: gpmi-nand@1806000{
+               gpmi: nand-controller@1806000{
                        compatible = "fsl,imx6sx-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 2b088f210331480ee94a503c6c0074809c17fbc9..d7d9f3e46b92a259679b83a61e0acd0c7fee429b 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -174,7 +174,7 @@
                        clocks = <&clks IMX6UL_CLK_APBHDMA>;
                };
 
-               gpmi: gpmi-nand@1806000 {
+               gpmi: nand-controller@1806000 {
                        compatible = "fsl,imx6q-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 85b8eddd77f27f43111161245c98b2c8586c53f3..84d9cc13afb955d9f749c2288820f9d013e18dc8 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -1221,7 +1221,7 @@
                        clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
                };
 
-               gpmi: gpmi-nand@33002000{
+               gpmi: nand-controller@33002000{
                        compatible = "fsl,imx7d-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;