From 3714dcc944c950b8082ac8b2b75058da3478c7e0 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sun, 4 Jun 2023 13:52:29 +0800
Subject: [PATCH] ramips: fix partition node for jcg q20

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 3f3f8f2ff5878a88779fdd409c2c7d5012af9888)
---
 .../ramips/dts/mt7621_jcg_q20-pb-boot.dts     |  76 ++++++-------
 target/linux/ramips/dts/mt7621_jcg_q20.dts    | 104 ++++++++----------
 target/linux/ramips/dts/mt7621_jcg_q20.dtsi   |  13 +++
 3 files changed, 91 insertions(+), 102 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts b/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
index f31325cda9..f58879f69d 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_q20-pb-boot.dts
@@ -7,55 +7,43 @@
 	model = "JCG Q20 (pb-boot)";
 };
 
-&nand {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
+&partitions {
+	partition@0 {
+		label = "Bootloader";
+		reg = <0x0 0x80000>;
+	};
 
-		partition@0 {
-			label = "Bootloader";
-			reg = <0x0 0x80000>;
-		};
+	partition@80000 {
+		label = "Nvram";
+		reg = <0x80000 0x40000>;
+		read-only;
+	};
 
-		partition@80000 {
-			label = "Nvram";
-			reg = <0x80000 0x40000>;
-			read-only;
-		};
+	partition@c0000 {
+		label = "Bdata";
+		reg = <0xc0000 0x40000>;
+		read-only;
+	};
 
-		partition@c0000 {
-			label = "Bdata";
-			reg = <0xc0000 0x40000>;
-			read-only;
-		};
+	partition@180000 {
+		label = "crash";
+		reg = <0x180000 0x40000>;
+		read-only;
+	};
 
-		factory: partition@100000 {
-			label = "Factory";
-			reg = <0x100000 0x80000>;
-			read-only;
-		};
+	partition@1c0000 {
+		label = "crash_log";
+		reg = <0x1c0000 0x40000>;
+		read-only;
+	};
 
-		partition@180000 {
-			label = "crash";
-			reg = <0x180000 0x40000>;
-			read-only;
-		};
+	partition@200000 {
+		label = "kernel";
+		reg = <0x200000 0x400000>;
+	};
 
-		partition@1c0000 {
-			label = "crash_log";
-			reg = <0x1c0000 0x40000>;
-			read-only;
-		};
-
-		partition@200000 {
-			label = "kernel";
-			reg = <0x200000 0x400000>;
-		};
-
-		partition@600000 {
-			label = "ubi";
-			reg = <0x600000 0x7980000>;
-		};
+	partition@600000 {
+		label = "ubi";
+		reg = <0x600000 0x7980000>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_jcg_q20.dts b/target/linux/ramips/dts/mt7621_jcg_q20.dts
index 3183208a85..2fdd69f195 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20.dts
+++ b/target/linux/ramips/dts/mt7621_jcg_q20.dts
@@ -23,63 +23,51 @@
 	};
 };
 
-&nand {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		partition@0 {
-			label = "Bootloader";
-			reg = <0x0 0x80000>;
-			read-only;
-		};
-
-		partition@80000 {
-			label = "Config";
-			reg = <0x80000 0x80000>;
-		};
-
-		factory: partition@100000 {
-			label = "Factory";
-			reg = <0x100000 0x80000>;
-			read-only;
-		};
-
-		partition@180000 {
-			label = "kernel";
-			reg = <0x180000 0x400000>;
-		};
-
-		ubiconcat0: partition@580000 {
-			label = "ubiconcat0";
-			reg = <0x580000 0x1c00000>;
-		};
-
-		partition@2180000 {
-			label = "firmware_backup";
-			reg = <0x2180000 0x2000000>;
-		};
-
-		partition@4180000 {
-			label = "rootfs_data_back";
-			reg = <0x4180000 0x80000>;
-			read-only;
-		};
-
-		partition@4200000 {
-			label = "nvram_config";
-			reg = <0x4200000 0x80000>;
-			read-only;
-		};
-
-		ubiconcat1: partition@4280000 {
-			label = "ubiconcat1";
-			reg = <0x4280000 0x3d00000>;
-		};
-
-		/*
-		 * last 512 KiB are for the bad block table
-		 */
+&partitions {
+	partition@0 {
+		label = "Bootloader";
+		reg = <0x0 0x80000>;
+		read-only;
 	};
+
+	partition@80000 {
+		label = "Config";
+		reg = <0x80000 0x80000>;
+	};
+
+	partition@180000 {
+		label = "kernel";
+		reg = <0x180000 0x400000>;
+	};
+
+	ubiconcat0: partition@580000 {
+		label = "ubiconcat0";
+		reg = <0x580000 0x1c00000>;
+	};
+
+	partition@2180000 {
+		label = "firmware_backup";
+		reg = <0x2180000 0x2000000>;
+	};
+
+	partition@4180000 {
+		label = "rootfs_data_back";
+		reg = <0x4180000 0x80000>;
+		read-only;
+	};
+
+	partition@4200000 {
+		label = "nvram_config";
+		reg = <0x4200000 0x80000>;
+		read-only;
+	};
+
+	ubiconcat1: partition@4280000 {
+		label = "ubiconcat1";
+		reg = <0x4280000 0x3d00000>;
+	};
+
+	/*
+	 * last 512 KiB are for the bad block table
+	 */
 };
diff --git a/target/linux/ramips/dts/mt7621_jcg_q20.dtsi b/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
index 4c2fe5e2b8..80cfe60318 100644
--- a/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
+++ b/target/linux/ramips/dts/mt7621_jcg_q20.dtsi
@@ -51,6 +51,19 @@
 
 &nand {
 	status = "okay";
+
+	partitions: partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		factory: partition@100000 {
+			label = "Factory";
+			reg = <0x100000 0x80000>;
+			read-only;
+		};
+
+	};
 };
 
 &pcie {