From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 2 Dec 2023 01:20:19 +0000 (-0800)
Subject: ipq806x: avoid duplicate partition nodes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e1043a746a1030062e73ea027d9a35c58bce6c6a;p=openwrt%2Fstaging%2Fxback.git

ipq806x: avoid duplicate partition nodes

Avoids dtc warnings by moving it in a subnode.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
index 07a7b531c8..0e63ddaa7a 100644
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
@@ -204,6 +204,15 @@
 			stock_partition@1340000 {
 				label = "stock_rootfs";
 				reg = <0x1340000 0x4000000>;
+
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				partition@0 {
+					label = "extra";
+					reg = <0x0 0x4000000>;
+				};
 			};
 			partition@5340000 {
 				label = "0:BOOTCONFIG";
@@ -253,6 +262,42 @@
 			stock_partition@6400000 {
 				label = "stock_rootfs_1";
 				reg = <0x6400000 0x4000000>;
+
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				partition@0 {
+					label = "fw_env";
+					reg = <0x0 0x100000>;
+
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
+
+						macaddr_fw_env_0: macaddr@0 {
+							reg = <0x00 0x6>;
+						};
+						macaddr_fw_env_6: macaddr@6 {
+							reg = <0x06 0x6>;
+						};
+						macaddr_fw_env_c: macaddr@c {
+							reg = <0x0c 0x6>;
+						};
+						macaddr_fw_env_12: macaddr@12 {
+							reg = <0x12 0x6>;
+						};
+						macaddr_fw_env_18: macaddr@18 {
+							reg = <0x18 0x6>;
+						};
+					};
+				};
+
+				partition@100000 {
+					label = "ubi";
+					reg = <0x100000 0x9b00000>;
+				};
 			};
 			stock_partition@a400000 {
 				label = "stock_fw_env";
@@ -270,41 +315,6 @@
 				label = "stock_scfgmgr";
 				reg = <0xaf00000 0x0100000>;
 			};
-
-			partition@6400000 {
-				label = "fw_env";
-				reg = <0x6400000 0x0100000>;
-
-				nvmem-layout {
-					compatible = "fixed-layout";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					macaddr_fw_env_0: macaddr@0 {
-						reg = <0x00 0x6>;
-					};
-					macaddr_fw_env_6: macaddr@6 {
-						reg = <0x06 0x6>;
-					};
-					macaddr_fw_env_c: macaddr@c {
-						reg = <0x0c 0x6>;
-					};
-					macaddr_fw_env_12: macaddr@12 {
-						reg = <0x12 0x6>;
-					};
-					macaddr_fw_env_18: macaddr@18 {
-						reg = <0x18 0x6>;
-					};
-				};
-			};
-			partition@6500000 {
-				label = "ubi";
-				reg = <0x6500000 0x9b00000>;
-			};
-			partition@1340000 {
-				label = "extra";
-				reg = <0x1340000 0x4000000>;
-			};
 		};
 	};
 };