Skip to content

Commit 8124b4a

Browse files
nxpfrankliShawn Guo
authored andcommitted
ARM: dts: imx: move nand related property under nand@0
Add child node nand@0 and move NAND related property under it to align modern nand-controller.yaml. Fix below CHECK_DTBS warnings: arch/arm/boot/dts/nxp/imx/imx6ull-colibri-aster.dtb: nand-controller@1806000 (fsl,imx6q-gpmi-nand): Unevaluated properties are not allowed ('nand-ecc-mode', 'nand-ecc-step-size', 'nand-ecc-strength', 'nand-on-flash-bbt' were unexpected) from schema $id: http://devicetree.org/schemas/mtd/gpmi-nand.yaml# Since 2019 year, commit (212e496 dt-bindings: mtd: Add YAML schemas for the generic NAND options) NAND related property is preferred located under nand@<n> even though only one NAND chip supported. Signed-off-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent af6c4ea commit 8124b4a

15 files changed

Lines changed: 82 additions & 22 deletions

arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@
3636
&gpmi {
3737
pinctrl-names = "default";
3838
pinctrl-0 = <&pinctrl_gpmi_nand>;
39-
nand-on-flash-bbt;
4039
status = "okay";
40+
41+
nand@0 {
42+
reg = <0>;
43+
nand-on-flash-bbt;
44+
};
4145
};
4246

4347
&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,12 @@
172172
&gpmi {
173173
pinctrl-names = "default";
174174
pinctrl-0 = <&pinctrl_gpmi_nand>;
175-
nand-on-flash-bbt;
176175
status = "okay";
176+
177+
nand@0 {
178+
reg = <0>;
179+
nand-on-flash-bbt;
180+
};
177181
};
178182

179183
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,12 @@
102102
&gpmi {
103103
pinctrl-names = "default";
104104
pinctrl-0 = <&pinctrl_gpmi_nand>;
105-
nand-on-flash-bbt;
106105
status = "okay";
106+
107+
nand@0 {
108+
reg = <0>;
109+
nand-on-flash-bbt;
110+
};
107111
};
108112

109113
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@
7373
&gpmi {
7474
pinctrl-names = "default";
7575
pinctrl-0 = <&pinctrl_gpmi_nand>;
76-
nand-on-flash-bbt;
7776
status = "disabled";
77+
78+
nand@0 {
79+
reg = <0>;
80+
nand-on-flash-bbt;
81+
};
7882
};
7983

8084
&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,14 @@
260260
&gpmi {
261261
pinctrl-names = "default";
262262
pinctrl-0 = <&pinctrl_gpmi_nand>;
263-
nand-on-flash-bbt;
264263
#address-cells = <1>;
265264
#size-cells = <0>;
266265
status = "okay";
266+
267+
nand@0 {
268+
reg = <0>;
269+
nand-on-flash-bbt;
270+
};
267271
};
268272

269273
&i2c3 {

arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,13 @@
252252
&gpmi {
253253
pinctrl-names = "default";
254254
pinctrl-0 = <&pinctrl_gpmi_nand>;
255-
nand-on-flash-bbt;
256255
fsl,no-blockmark-swap;
257256
status = "okay";
257+
258+
nand@0 {
259+
reg = <0>;
260+
nand-on-flash-bbt;
261+
};
258262
};
259263

260264
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,12 @@
133133
&gpmi {
134134
pinctrl-names = "default";
135135
pinctrl-0 = <&pinctrl_gpmi_nand>;
136-
nand-on-flash-bbt;
137136
status = "okay";
137+
138+
nand@0 {
139+
reg = <0>;
140+
nand-on-flash-bbt;
141+
};
138142
};
139143

140144
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,12 @@
101101
&gpmi {
102102
pinctrl-names = "default";
103103
pinctrl-0 = <&pinctrl_gpmi_nand>;
104-
nand-on-flash-bbt;
105104
status = "disabled";
105+
106+
nand@0 {
107+
reg = <0>;
108+
nand-on-flash-bbt;
109+
};
106110
};
107111

108112
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@
6363
&gpmi {
6464
pinctrl-names = "default";
6565
pinctrl-0 = <&pinctrl_gpmi_nand>;
66-
nand-on-flash-bbt;
6766
status = "disabled";
67+
68+
nand@0 {
69+
reg = <0>;
70+
nand-on-flash-bbt;
71+
};
6872
};
6973

7074
&i2c1 {

arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,13 @@
296296
&gpmi {
297297
pinctrl-names = "default";
298298
pinctrl-0 = <&pinctrl_gpmi_nand>;
299-
nand-on-flash-bbt;
300299
fsl,no-blockmark-swap;
301300
status = "okay";
301+
302+
nand@0 {
303+
reg = <0>;
304+
nand-on-flash-bbt;
305+
};
302306
};
303307

304308
&i2c2 {

0 commit comments

Comments
 (0)