From c95a08b1c565e29a986f4eda5d35ea0613d35095 Mon Sep 17 00:00:00 2001
From: Joe Holden <jwh@zorins.us>
Date: Tue, 29 Jul 2025 19:19:22 +0000
Subject: [PATCH] realtek: Zyxel GS1900-48 dts fixes

 * Use SDS for phy 48/49
 * Use correct link/phy settings for SFP ports
 * Remove read-only flag from u-boot env so fw_setenv actually works

Signed-off-by: Joe Holden <jwh@zorins.us>
Link: https://github.com/openwrt/openwrt/pull/19596
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../realtek/dts/rtl8393_zyxel_gs1900-48.dts   | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
index 8790c3997b..d267cd28fd 100644
--- a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
+++ b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
@@ -54,7 +54,7 @@
 		#size-cells = <0>;
 	};
 
-	sfp0: sfp-p9 {
+	sfp0: sfp-p49 {
 		compatible = "sff,sfp";
 		i2c-bus = <&i2c0>;
 		los-gpio = <&gpio1 27 GPIO_ACTIVE_HIGH>;
@@ -73,7 +73,7 @@
 		#size-cells = <0>;
 	};
 
-	sfp1: sfp-p10 {
+	sfp1: sfp-p50 {
 		compatible = "sff,sfp";
 		i2c-bus = <&i2c1>;
 		los-gpio = <&gpio1 33 GPIO_ACTIVE_HIGH>;
@@ -121,12 +121,10 @@
 			partition@40000 {
 				label = "u-boot-env";
 				reg = <0x40000 0x10000>;
-				read-only;
 			};
 			partition@50000 {
 				label = "u-boot-env2";
 				reg = <0x50000 0x10000>;
-				read-only;
 			};
 			partition@60000 {
 				label = "jffs";
@@ -214,8 +212,8 @@
 		EXTERNAL_PHY(47)
 
 		/* RTL8393 Internal SerDes */
-		INTERNAL_PHY(48)
-		INTERNAL_PHY(49)
+		INTERNAL_PHY_SDS(48, 12)
+		INTERNAL_PHY_SDS(49, 13)
 	};
 };
 
@@ -282,31 +280,19 @@
 		port@48 {
 			reg = <48>;
 			label = "lan49";
-			phy-mode = "sgmii";
+			phy-mode = "1000base-x";
 			phy-handle = <&phy48>;
+			managed = "in-band-status";
 			sfp = <&sfp0>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-				pause;
-			};
-
 		};
 
 		port@49 {
 			reg = <49>;
 			label = "lan50";
-			phy-mode = "sgmii";
+			phy-mode = "1000base-x";
 			phy-handle = <&phy49>;
+			managed = "in-band-status";
 			sfp = <&sfp1>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-				pause;
-			};
-
 		};
 
 		/* CPU-Port */