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

This reverts commit 8124b4a.

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: 8124b4a ("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>

Author: MaxKrummenacher

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {