Revert "ARM: dts: imx: move nand related property under nand@0"

This reverts commit 8124b4a4a96b57d6cc3705a9df9623c52baa047b.

The change introduced a regression: at least Colibri iMX6ULL and
Colibri iMX7 no longer boot with that commit applied, while they boot
again after reverting it.

Although this has only been verified on these two modules, the issue
is expected to affect all device trees using the gpmi-nand driver.

[    0.876938] Creating 5 MTD partitions on "gpmi-nand":
[    0.876974] 0x000000000000-0x000000080000 : "mx7-bcb"
[    0.879860] 0x000000080000-0x000000200000 : "u-boot1"
[    0.884761] 0x000000200000-0x000000380000 : "u-boot2"
[    0.886993] 0x000000380000-0x000000400000 : "u-boot-env"
[    0.894686] 0x000000400000-0x000020000000 : "ubi"
[    0.899054] gpmi-nand 33002000.nand-controller: driver registered.
...
[    0.960443] ubi0: default fastmap pool size: 200
[    0.960476] ubi0: default fastmap WL pool size: 100
[    0.960500] ubi0: attaching mtd4
[    1.636355] ubi0 error: scan_peb: bad image sequence number 1588722158 in PEB 4060, expected 1574791632
...
[    1.649889] ubi0 error: ubi_attach_mtd_dev: failed to attach mtd4, error -22
[    1.650029] UBI error: cannot attach mtd4
...
[    1.670262] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,253)

Fixes: 8124b4a4a96b ("ARM: dts: imx: move nand related property under nand@0")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>

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 f452764fae00ef801ab0d69879457f9a404bef2e..547fb141ec0c9f4f2aace5f2095bfbd2d921d2dd 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,12 +36,8 @@
 &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 58ecdb87c6d404ee3e06501f3bddd029eb9670af..9975b6ee433d1daf4ed24bf2b91f167fbaa398ff 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
@@ -172,12 +172,8 @@
 &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 6f3becd33a5b5f83dcc5df3286244fb601eaa537..aa9a442852f41b76782c570d28d277e7eb586636 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,12 +102,8 @@
 &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 f2140dd8525f81c9b242cef1e4970baa6462b9b8..85e278eb201610a1c851c4093025bb205e02a3b3 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,12 +73,8 @@
 &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 131a3428ddb86796ed843b46cbae12f5d095b2f4..c93dbc595ef6eceda5fdf7b90dac57bfed59e489 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,14 +260,10 @@
 &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 d29adfef5fdba321606eb68614cc82393fea9052..57297d6521cf09f1fd629ae375c9994ebb683375 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
@@ -252,13 +252,9 @@
 &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 40d530c1dc29f2a679804992b8b41fd05ee7ead3..2a6bb5ff808add0d3648480061e136e1050a1ccf 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
@@ -133,12 +133,8 @@
 &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 776f6f78ee4631fc154bf261299f687285137413..e34c8cbe36aec682f46ffa128247bc47f3a6cab9 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
@@ -101,12 +101,8 @@
 &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 27e4d2aec137fc35016428d8b3605ebaed65f490..a3ea1b20846253b8c4a5dc3a0ff0d505c24be3ff 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,12 +63,8 @@
 &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 dc53f9286ffe27c718b8b8bd01169d1ff4ad13af..1992dfb53b45cd308522c3e922d5758f5b8fe527 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
@@ -296,13 +296,9 @@
 &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 eaed2cbf0c82aa55bb436a03e0eb45be7cf94c5b..ec3c1e7301f48f6fbf0190a8286d5110ef61c35d 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
@@ -160,15 +160,11 @@
        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 3dfd43b320553c45e22e4862cb1299c11eee1dfd..43518bf0760249831781dc5220fa640eabf16d14 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,15 +43,11 @@
 &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 fc298f57bfff349fe51983baae19c58d7e99f1aa..83b9de17cee2de37c15a461ddbdc74f0aee2e34c 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,12 +60,8 @@
 &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 8ec18eae98a46abbf3d0a81cca2c5bd24765fcb6..2d9f495660c9a329dcfb15d04864690efbd1cb7f 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,12 +25,8 @@
 &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 a41dc4edfc0ddc34ff235d6ba9964120fe56fe27..8666dcd7fe974699354beba7a04844fd0a2cd27f 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
@@ -375,14 +375,10 @@
 /* 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 */