From 2e6ec200dfe6ee62380821bc001d0b546bc6f799 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 1 Dec 2023 14:32:23 -0800
Subject: [PATCH] ath79: move kernel and ubi into subnodes

Avoids dtc warnings regarding two sections having the same numbers.

X: duplicate unit-address (also used in node Y)

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 .../linux/ath79/dts/ar9344_netgear_wndr.dtsi  | 29 ++++++++++---------
 .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 20 ++++++++-----
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index d2a30000044e..49057548f89d 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -90,7 +90,7 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			ubi@ac0000 {
+			ubi@0 {
 				label = "ubi";
 				reg = <0x0 0x7500000>;
 			};
@@ -171,22 +171,23 @@
 			reg = <0x3c0000 0x300000>;
 		};
 
-		kernel@6c0000 {
-			label = "kernel";
-			reg = <0x6c0000 0x400000>;
-		};
-
-		ubiconcat0: partition@ac0000 {
-			label = "ubiconcat0";
-			reg = <0xac0000 0x1500000>;
-		};
-
 		partition@6c0000 {
 			label = "firmware";
 			reg = <0x6c0000 0x1900000>;
-			compatible = "openwrt,uimage", "denx,uimage";
-			openwrt,ih-magic = <0x33373033>;
-			openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
+
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			kernel@0 {
+				label = "kernel";
+				reg = <0x0 0x400000>;
+			};
+
+			ubiconcat0: partition@400000 {
+				label = "ubiconcat0";
+				reg = <0x400000 0x1500000>;
+			};
 		};
 
 		partition@1fc0000 {
diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 9aee8c362cdb..20230e684e3a 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -143,16 +143,20 @@
 		firmware@500000 {
 			label = "firmware";
 			reg = <0x500000 0x7b00000>;
-		};
 
-		partition@500000 {
-			label = "kernel";
-			reg = <0x500000 0x400000>;
-		};
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "kernel";
+				reg = <0x0 0x400000>;
+			};
 
-		partition@900000 {
-			label = "ubi";
-			reg = <0x900000 0x7700000>;
+			partition@400000 {
+				label = "ubi";
+				reg = <0x400000 0x7700000>;
+			};
 		};
 	};
 };
-- 
2.30.2