Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anson Huang and committed by
Shawn Guo
17580888 8da4716d

+11 -11
+1 -1
arch/arm/boot/dts/imx23-evk.dts
··· 53 53 54 54 apb@80000000 { 55 55 apbh@80000000 { 56 - gpmi-nand@8000c000 { 56 + nand-controller@8000c000 { 57 57 pinctrl-names = "default"; 58 58 pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>; 59 59 status = "okay";
+1 -1
arch/arm/boot/dts/imx23.dtsi
··· 76 76 status = "disabled"; 77 77 }; 78 78 79 - gpmi-nand@8000c000 { 79 + nand-controller@8000c000 { 80 80 compatible = "fsl,imx23-gpmi-nand"; 81 81 #address-cells = <1>; 82 82 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx28-apf28.dts
··· 17 17 18 18 apb@80000000 { 19 19 apbh@80000000 { 20 - gpmi-nand@8000c000 { 20 + nand-controller@8000c000 { 21 21 pinctrl-names = "default"; 22 22 pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; 23 23 status = "okay";
+1 -1
arch/arm/boot/dts/imx28-apx4devkit.dts
··· 13 13 14 14 apb@80000000 { 15 15 apbh@80000000 { 16 - gpmi-nand@8000c000 { 16 + nand-controller@8000c000 { 17 17 pinctrl-names = "default"; 18 18 pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; 19 19 status = "okay";
+1 -1
arch/arm/boot/dts/imx28-evk.dts
··· 97 97 98 98 apb@80000000 { 99 99 apbh@80000000 { 100 - gpmi-nand@8000c000 { 100 + nand-controller@8000c000 { 101 101 pinctrl-names = "default"; 102 102 pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg 103 103 &gpmi_pins_evk>;
+1 -1
arch/arm/boot/dts/imx28-m28cu3.dts
··· 17 17 18 18 apb@80000000 { 19 19 apbh@80000000 { 20 - gpmi-nand@8000c000 { 20 + nand-controller@8000c000 { 21 21 #address-cells = <1>; 22 22 #size-cells = <1>; 23 23 pinctrl-names = "default";
+1 -1
arch/arm/boot/dts/imx28.dtsi
··· 100 100 status = "disabled"; 101 101 }; 102 102 103 - gpmi: gpmi-nand@8000c000 { 103 + gpmi: nand-controller@8000c000 { 104 104 compatible = "fsl,imx28-gpmi-nand"; 105 105 #address-cells = <1>; 106 106 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx6qdl.dtsi
··· 159 159 clocks = <&clks IMX6QDL_CLK_APBH_DMA>; 160 160 }; 161 161 162 - gpmi: gpmi-nand@112000 { 162 + gpmi: nand-controller@112000 { 163 163 compatible = "fsl,imx6q-gpmi-nand"; 164 164 reg = <0x00112000 0x2000>, <0x00114000 0x2000>; 165 165 reg-names = "gpmi-nand", "bch";
+1 -1
arch/arm/boot/dts/imx6sx.dtsi
··· 213 213 clocks = <&clks IMX6SX_CLK_APBH_DMA>; 214 214 }; 215 215 216 - gpmi: gpmi-nand@1806000{ 216 + gpmi: nand-controller@1806000{ 217 217 compatible = "fsl,imx6sx-gpmi-nand"; 218 218 #address-cells = <1>; 219 219 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx6ul.dtsi
··· 174 174 clocks = <&clks IMX6UL_CLK_APBHDMA>; 175 175 }; 176 176 177 - gpmi: gpmi-nand@1806000 { 177 + gpmi: nand-controller@1806000 { 178 178 compatible = "fsl,imx6q-gpmi-nand"; 179 179 #address-cells = <1>; 180 180 #size-cells = <1>;
+1 -1
arch/arm/boot/dts/imx7s.dtsi
··· 1221 1221 clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; 1222 1222 }; 1223 1223 1224 - gpmi: gpmi-nand@33002000{ 1224 + gpmi: nand-controller@33002000{ 1225 1225 compatible = "fsl,imx7d-gpmi-nand"; 1226 1226 #address-cells = <1>; 1227 1227 #size-cells = <1>;