realtek: rtl838x: join Netgear GSxxx flash layouts

Flash layouts for GS108Tv3, GS110TPPv1, GS308Tv1 and GS310TPv1 are
almost identical, except for the uimage header magic.

Move the flash layout to the common dtsi, and only place the magic value
in the device dts files.

Signed-off-by: Sander Vanheule <sander@svanheule.net>

7 files changed, 76 insertions, 124 deletions

diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit.dtsi b/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit.dtsi
index 5e587f278d6..aca1a14774e 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit.dtsi
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit.dtsi
@@ -58,6 +58,62 @@
 	};
 };
 
+&spi0 {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <50000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0000000 0x00e0000>;
+				read-only;
+			};
+
+			partition@e0000 {
+				label = "u-boot-env";
+				reg = <0x00e0000 0x0010000>;
+			};
+
+			partition@f0000 {
+				label = "u-boot-env2";
+				reg = <0x00f0000 0x0010000>;
+			};
+
+			partition@100000 {
+				label = "jffs";
+				reg = <0x0100000 0x0100000>;
+				read-only;
+			};
+
+			partition@200000 {
+				label = "jffs2";
+				reg = <0x0200000 0x0100000>;
+				read-only;
+			};
+
+			firmware: partition@300000 {
+				label = "firmware";
+				compatible = "openwrt,uimage", "denx,uimage";
+				reg = <0x0300000 0x0e80000>;
+			};
+
+			partition@1180000 {
+				label = "runtime2";
+				reg = <0x1180000 0x0e80000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &switch0 {
 	ports {
 		#address-cells = <1>;
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_1xx.dtsi b/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_1xx.dtsi
deleted file mode 100644
index fd44543bb42..00000000000
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_1xx.dtsi
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rtl8380_netgear_gigabit.dtsi"
-
-&spi0 {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <50000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "u-boot";
-				reg = <0x0000000 0x00e0000>;
-				read-only;
-			};
-
-			partition@e0000 {
-				label = "u-boot-env";
-				reg = <0x00e0000 0x0010000>;
-			};
-
-			partition@f0000 {
-				label = "u-boot-env2";
-				reg = <0x00f0000 0x0010000>;
-			};
-
-			partition@100000 {
-				label = "jffs";
-				reg = <0x0100000 0x0100000>;
-				read-only;
-			};
-
-			partition@200000 {
-				label = "jffs2";
-				reg = <0x0200000 0x0100000>;
-				read-only;
-			};
-
-			partition@300000 {
-				label = "firmware";
-				compatible = "openwrt,uimage", "denx,uimage";
-				openwrt,ih-magic = <0x4e474520>;
-				reg = <0x0300000 0x0e80000>;
-			};
-
-			partition@1180000 {
-				label = "runtime2";
-				reg = <0x1180000 0x0e80000>;
-				read-only;
-			};
-		};
-	};
-};
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_3xx.dtsi b/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_3xx.dtsi
deleted file mode 100644
index 0ade665c988..00000000000
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gigabit_3xx.dtsi
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "rtl8380_netgear_gigabit.dtsi"
-
-&spi0 {
-	status = "okay";
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <50000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				label = "u-boot";
-				reg = <0x0000000 0x00e0000>;
-				read-only;
-			};
-
-			partition@e0000 {
-				label = "u-boot-env";
-				reg = <0x00e0000 0x0010000>;
-			};
-
-			partition@f0000 {
-				label = "u-boot-env2";
-				reg = <0x00f0000 0x0010000>;
-			};
-
-			partition@100000 {
-				label = "jffs";
-				reg = <0x0100000 0x0100000>;
-				read-only;
-			};
-
-			partition@200000 {
-				label = "jffs2";
-				reg = <0x0200000 0x0100000>;
-				read-only;
-			};
-
-			partition@300000 {
-				label = "firmware";
-				compatible = "openwrt,uimage", "denx,uimage";
-				openwrt,ih-magic = <0x4e474335>;
-				reg = <0x0300000 0x0e80000>;
-			};
-
-			partition@1180000 {
-				label = "runtime2";
-				reg = <0x1180000 0x0e80000>;
-				read-only;
-			};
-		};
-	};
-};
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
index e149834d446..c1d72b880b1 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs108t-v3.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rtl8380_netgear_gigabit_1xx.dtsi"
+#include "rtl8380_netgear_gigabit.dtsi"
 
 #include <dt-bindings/leds/common.h>
 
@@ -33,3 +33,7 @@
 		};
 	};
 };
+
+&firmware {
+	openwrt,ih-magic = <0x4e474520>;
+};
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
index b61af62ea53..599b2e3b51f 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs110tpp-v1.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rtl8380_netgear_gigabit_1xx.dtsi"
+#include "rtl8380_netgear_gigabit.dtsi"
 #include <dt-bindings/leds/common.h>
 
 / {
@@ -40,6 +40,10 @@
 	};
 };
 
+&firmware {
+	openwrt,ih-magic = <0x4e474520>;
+};
+
 &uart1 {
 	status = "okay";
 };
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
index cd69e80186c..5cf3ca0c81a 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs308t-v1.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rtl8380_netgear_gigabit_3xx.dtsi"
+#include "rtl8380_netgear_gigabit.dtsi"
 
 #include <dt-bindings/leds/common.h>
 
@@ -33,3 +33,7 @@
 		};
 	};
 };
+
+&firmware {
+	openwrt,ih-magic = <0x4e474335>;
+};
diff --git a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs310tp-v1.dts b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs310tp-v1.dts
index dacd504ac49..a6f7181c11e 100644
--- a/target/linux/realtek/dts-5.15/rtl8380_netgear_gs310tp-v1.dts
+++ b/target/linux/realtek/dts-5.15/rtl8380_netgear_gs310tp-v1.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rtl8380_netgear_gigabit_3xx.dtsi"
+#include "rtl8380_netgear_gigabit.dtsi"
 
 / {
 	compatible = "netgear,gs310tp-v1", "realtek,rtl838x-soc";
@@ -8,6 +8,10 @@
 
 };
 
+&firmware {
+	openwrt,ih-magic = <0x4e474335>;
+};
+
 &uart1 {
 	status = "okay";
 };