ARM: dts: armada-xp: fix Armada XP boards NAND description

[ Upstream commit 6fc979179c98d2591784937d5618edc3e5cd31c1 ]

Commit 3b799199 ("ARM: dts:
armada-370-xp: update NAND node with new bindings") updated some
Marvell Armada DT description to use the new NAND controller bindings,
but did it incorrectly for a number of boards: armada-xp-gp,
armada-xp-db and armada-xp-lenovo-ix4-300d. Due to this, the NAND is
no longer detected on those platforms.

This commit fixes that by properly using the new NAND DT binding. This
commit was runtime-tested on Armada XP GP, the two other platforms are
only compile-tested.

Fixes: 3b799199 ("ARM: dts: armada-370-xp: update NAND node with new bindings")
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: NThomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: NGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

arch/arm/boot/dts/armada-xp-db.dts

@@ -144,11 +144,13 @@
 				status = "okay";
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 
 					partitions {
@@ -167,7 +169,7 @@
 						partition@1000000 {
 							label = "Filesystem";
 							reg = <0x1000000 0x3f000000>;
-
+						};
 					};
 				};
 			};

arch/arm/boot/dts/armada-xp-gp.dts

@@ -160,14 +160,17 @@
 				status = "okay";
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 				};
 			};
+		};
 
 		bm-bppi {
 			status = "okay";

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

@@ -81,11 +81,13 @@
 
 			};
 
-			nand@d0000 {
+			nand-controller@d0000 {
 				status = "okay";
+
+				nand@0 {
+					reg = <0>;
 					label = "pxa3xx_nand-0";
-				num-cs = <1>;
-				marvell,nand-keep-config;
+					nand-rb = <0>;
 					nand-on-flash-bbt;
 
 					partitions {
@@ -129,6 +131,7 @@
 				};
 			};
 		};
+	};
 
 	gpio-keys {
 		compatible = "gpio-keys";