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
(212e496935929 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>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
index 547fb141ec0c9f4f2aace5f2095bfbd2d921d2dd..f452764fae00ef801ab0d69879457f9a404bef2e 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
@@ -36,8 +36,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c3 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
index 9975b6ee433d1daf4ed24bf2b91f167fbaa398ff..58ecdb87c6d404ee3e06501f3bddd029eb9670af 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
@@ -172,8 +172,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
index aa9a442852f41b76782c570d28d277e7eb586636..6f3becd33a5b5f83dcc5df3286244fb601eaa537 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
@@ -102,8 +102,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
index 85e278eb201610a1c851c4093025bb205e02a3b3..f2140dd8525f81c9b242cef1e4970baa6462b9b8 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
@@ -73,8 +73,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "disabled";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c3 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
index c93dbc595ef6eceda5fdf7b90dac57bfed59e489..131a3428ddb86796ed843b46cbae12f5d095b2f4 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
@@ -260,10 +260,14 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        #address-cells = <1>;
        #size-cells = <0>;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c3 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
index 57297d6521cf09f1fd629ae375c9994ebb683375..d29adfef5fdba321606eb68614cc82393fea9052 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
@@ -252,9 +252,13 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        fsl,no-blockmark-swap;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
index 2a6bb5ff808add0d3648480061e136e1050a1ccf..40d530c1dc29f2a679804992b8b41fd05ee7ead3 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
@@ -133,8 +133,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
index e34c8cbe36aec682f46ffa128247bc47f3a6cab9..776f6f78ee4631fc154bf261299f687285137413 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
@@ -101,8 +101,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "disabled";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
index a3ea1b20846253b8c4a5dc3a0ff0d505c24be3ff..27e4d2aec137fc35016428d8b3605ebaed65f490 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
@@ -63,8 +63,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "disabled";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
index 1992dfb53b45cd308522c3e922d5758f5b8fe527..dc53f9286ffe27c718b8b8bd01169d1ff4ad13af 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
@@ -296,9 +296,13 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        fsl,no-blockmark-swap;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &i2c2 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
index ec3c1e7301f48f6fbf0190a8286d5110ef61c35d..eaed2cbf0c82aa55bb436a03e0eb45be7cf94c5b 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
@@ -160,11 +160,15 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
        fsl,use-minimum-ecc;
-       nand-on-flash-bbt;
-       nand-ecc-mode = "hw";
-       nand-ecc-strength = <8>;
-       nand-ecc-step-size = <512>;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+               nand-ecc-mode = "hw";
+               nand-ecc-strength = <8>;
+               nand-ecc-step-size = <512>;
+       };
 };
 
 /* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
index 43518bf0760249831781dc5220fa640eabf16d14..3dfd43b320553c45e22e4862cb1299c11eee1dfd 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
@@ -43,11 +43,15 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-ecc-mode = "hw";
-       nand-ecc-strength = <0>;
-       nand-ecc-step-size = <0>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-ecc-mode = "hw";
+               nand-ecc-strength = <0>;
+               nand-ecc-step-size = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &iomuxc {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
index 83b9de17cee2de37c15a461ddbdc74f0aee2e34c..fc298f57bfff349fe51983baae19c58d7e99f1aa 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
@@ -60,8 +60,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "disabled";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &uart1 {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts b/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
index 2d9f495660c9a329dcfb15d04864690efbd1cb7f..8ec18eae98a46abbf3d0a81cca2c5bd24765fcb6 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
@@ -25,8 +25,12 @@
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
-       nand-on-flash-bbt;
        status = "okay";
+
+       nand@0 {
+               reg = <0>;
+               nand-on-flash-bbt;
+       };
 };
 
 &snvs_poweroff {

diff --git a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
index 8666dcd7fe974699354beba7a04844fd0a2cd27f..a41dc4edfc0ddc34ff235d6ba9964120fe56fe27 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
@@ -375,10 +375,14 @@
 /* NAND on such SKUs */
 &gpmi {
        fsl,use-minimum-ecc;
-       nand-ecc-mode = "hw";
-       nand-on-flash-bbt;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
+
+       nand@0 {
+               reg = <0>;
+               nand-ecc-mode = "hw";
+               nand-on-flash-bbt;
+       };
 };
 
 /* On-module Power I2C */