[openwrt/openwrt] realtek: rtl838x: rename GS1900 series v1/v2 to A1/B1
LEDE Commits
lede-commits at lists.infradead.org
Wed Sep 24 04:41:08 PDT 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/d205878ede886dd2e00b31e4f3c8444b16ae16be
commit d205878ede886dd2e00b31e4f3c8444b16ae16be
Author: Stijn Segers <foss at volatilesystems.org>
AuthorDate: Thu Sep 4 20:26:08 2025 +0200
realtek: rtl838x: rename GS1900 series v1/v2 to A1/B1
Zyxel labels their switch revisions A1, B1, ... and not v1, v2, ...
Rename the devices as such in OpenWrt to match the labels. Of note:
the first (A1) revision is never labeled as such on the label, just
in the web UI. Provide compatibles for seamless sysupgrade.
For a recent overview of Zyxel GS1900 series revisions, see the
table linked in https://forum.openwrt.org/t//57875/3874.
Signed-off-by: Stijn Segers <foss at volatilesystems.org>
Link: https://github.com/openwrt/openwrt/pull/20118
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
...0-10hp.dts => rtl8380_zyxel_gs1900-10hp-a1.dts} | 4 +-
...1900-8-v1.dts => rtl8380_zyxel_gs1900-8-a1.dts} | 4 +-
...1900-8-v2.dts => rtl8380_zyxel_gs1900-8-b1.dts} | 4 +-
...-8hp-v2.dts => rtl8380_zyxel_gs1900-8hp-a1.dts} | 4 +-
...-8hp-v1.dts => rtl8380_zyxel_gs1900-8hp-b1.dts} | 4 +-
...s1900-16.dts => rtl8382_zyxel_gs1900-16-a1.dts} | 4 +-
...00-24-v1.dts => rtl8382_zyxel_gs1900-24-a1.dts} | 4 +-
...900-24e.dts => rtl8382_zyxel_gs1900-24e-a1.dts} | 4 +-
...0-24ep.dts => rtl8382_zyxel_gs1900-24ep-a1.dts} | 4 +-
...4hp-v1.dts => rtl8382_zyxel_gs1900-24hp-a1.dts} | 4 +-
...4hp-v2.dts => rtl8382_zyxel_gs1900-24hp-b1.dts} | 4 +-
target/linux/realtek/image/rtl838x.mk | 75 +++++++++++++---------
12 files changed, 66 insertions(+), 53 deletions(-)
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
similarity index 95%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
rename to target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
index 5b13df6ae7..a1634d2aae 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-10hp", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-10HP Switch";
+ compatible = "zyxel,gs1900-10hp-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-10HP A1 Switch";
/* i2c of the left SFP cage: port 9 */
i2c0: i2c-gpio-0 {
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v1.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-a1.dts
similarity index 65%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v1.dts
rename to target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-a1.dts
index 9838c023da..fd3d63e5d5 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio_emulated.dtsi"
/ {
- compatible = "zyxel,gs1900-8-v1", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-8 v1 Switch";
+ compatible = "zyxel,gs1900-8-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-8 A1 Switch";
};
&gpio1 {
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v2.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-b1.dts
similarity index 64%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v2.dts
rename to target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-b1.dts
index 84f87ea037..697d08547e 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v2.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-b1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-8-v2", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-8 v2 Switch";
+ compatible = "zyxel,gs1900-8-b1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-8 B1 Switch";
};
&gpio1 {
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-a1.dts
similarity index 62%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts
rename to target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-a1.dts
index 728342c22f..172809e5cc 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-8hp-v2", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-8HP v2 Switch";
+ compatible = "zyxel,gs1900-8hp-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-8HP A1 Switch";
};
&uart1 {
diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-b1.dts
similarity index 62%
rename from target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts
rename to target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-b1.dts
index 22c052f506..8ef021bbdf 100644
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-b1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-8hp-v1", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-8HP v1 Switch";
+ compatible = "zyxel,gs1900-8hp-b1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-8HP B1 Switch";
};
&uart1 {
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16-a1.dts
similarity index 86%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-16-a1.dts
index 5b38236031..846ddce777 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-16", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-16";
+ compatible = "zyxel,gs1900-16-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-16 A1";
};
&mdio_bus0 {
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
similarity index 96%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
index 6f6ae25f88..927d38f55c 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-24-v1", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-24 v1";
+ compatible = "zyxel,gs1900-24-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-24 A1";
memory at 0 {
reg = <0x0 0x4000000>;
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e-a1.dts
similarity index 92%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e-a1.dts
index e16e3b96e4..1f2a565d81 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-24e", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-24E";
+ compatible = "zyxel,gs1900-24e-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-24E A1";
};
&mdio_bus0 {
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep-a1.dts
similarity index 92%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep-a1.dts
index 7460068d27..b4d07dd2d5 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-24ep", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-24EP Switch";
+ compatible = "zyxel,gs1900-24ep-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-24EP A1 Switch";
};
&uart1 {
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
similarity index 96%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
index 76e619c5a1..dc7a474408 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-24hp-v1", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-24HP v1";
+ compatible = "zyxel,gs1900-24hp-a1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-24HP A1";
memory at 0 {
reg = <0x0 0x4000000>;
diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
similarity index 96%
rename from target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
rename to target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
index c8722f0b70..f6bd8447ac 100644
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
@@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ {
- compatible = "zyxel,gs1900-24hp-v2", "realtek,rtl838x-soc";
- model = "Zyxel GS1900-24HP v2 Switch";
+ compatible = "zyxel,gs1900-24hp-b1", "realtek,rtl838x-soc";
+ model = "Zyxel GS1900-24HP B1 Switch";
/* i2c of the left SFP cage: port 25 */
i2c0: i2c-gpio-0 {
diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index 23fb19dba7..aa07bd371e 100644
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -345,105 +345,118 @@ define Device/tplink_t1600g-28ts-v3
endef
TARGET_DEVICES += tplink_t1600g-28ts-v3
-define Device/zyxel_gs1900-10hp
+define Device/zyxel_gs1900-10hp-a1
$(Device/zyxel_gs1900)
SOC := rtl8380
DEVICE_MODEL := GS1900-10HP
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAZI
DEVICE_PACKAGES += realtek-poe
+ SUPPORTED_DEVICES += zyxel,gs1900-10hp
endef
-TARGET_DEVICES += zyxel_gs1900-10hp
+TARGET_DEVICES += zyxel_gs1900-10hp-a1
-define Device/zyxel_gs1900-16
+define Device/zyxel_gs1900-16-a1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-16
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHJ
+ SUPPORTED_DEVICES += zyxel,gs1900-16
endef
-TARGET_DEVICES += zyxel_gs1900-16
+TARGET_DEVICES += zyxel_gs1900-16-a1
-define Device/zyxel_gs1900-8-v1
+define Device/zyxel_gs1900-8-a1
$(Device/zyxel_gs1900)
SOC := rtl8380
DEVICE_MODEL := GS1900-8
- DEVICE_VARIANT := v1
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHH
- SUPPORTED_DEVICES += zyxel,gs1900-8
+ SUPPORTED_DEVICES += zyxel,gs1900-8 zyxel,gs1900-8-v1
endef
-TARGET_DEVICES += zyxel_gs1900-8-v1
+TARGET_DEVICES += zyxel_gs1900-8-a1
-define Device/zyxel_gs1900-8-v2
+define Device/zyxel_gs1900-8-b1
$(Device/zyxel_gs1900)
SOC := rtl8380
DEVICE_MODEL := GS1900-8
- DEVICE_VARIANT := v2
+ DEVICE_VARIANT := B1
ZYXEL_VERS := AAHH
- SUPPORTED_DEVICES += zyxel,gs1900-8
+ SUPPORTED_DEVICES += zyxel,gs1900-8 zyxel,gs1900-8-v2
endef
-TARGET_DEVICES += zyxel_gs1900-8-v2
+TARGET_DEVICES += zyxel_gs1900-8-b1
-define Device/zyxel_gs1900-8hp-v1
+define Device/zyxel_gs1900-8hp-a1
$(Device/zyxel_gs1900)
SOC := rtl8380
DEVICE_MODEL := GS1900-8HP
- DEVICE_VARIANT := v1
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHI
+ SUPPORTED_DEVICES += zyxel,gs1900-8hp-v1
DEVICE_PACKAGES += realtek-poe
endef
-TARGET_DEVICES += zyxel_gs1900-8hp-v1
+TARGET_DEVICES += zyxel_gs1900-8hp-a1
-define Device/zyxel_gs1900-8hp-v2
+define Device/zyxel_gs1900-8hp-b1
$(Device/zyxel_gs1900)
SOC := rtl8380
DEVICE_MODEL := GS1900-8HP
- DEVICE_VARIANT := v2
+ DEVICE_VARIANT := B1
ZYXEL_VERS := AAHI
+ SUPPORTED_DEVICES += zyxel,gs1900-8hp-v2
DEVICE_PACKAGES += realtek-poe
endef
-TARGET_DEVICES += zyxel_gs1900-8hp-v2
+TARGET_DEVICES += zyxel_gs1900-8hp-b1
-define Device/zyxel_gs1900-24-v1
+define Device/zyxel_gs1900-24-a1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-24
- DEVICE_VARIANT := v1
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHL
+ SUPPORTED_DEVICES += zyxel,gs1900-24-v1
endef
-TARGET_DEVICES += zyxel_gs1900-24-v1
+TARGET_DEVICES += zyxel_gs1900-24-a1
-define Device/zyxel_gs1900-24e
+define Device/zyxel_gs1900-24e-a1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-24E
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHK
+ SUPPORTED_DEVICES += zyxel,gs1900-24e
endef
-TARGET_DEVICES += zyxel_gs1900-24e
+TARGET_DEVICES += zyxel_gs1900-24e-a1
-define Device/zyxel_gs1900-24ep
+define Device/zyxel_gs1900-24ep-a1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-24EP
+ DEVICE_VARIANT := A1
ZYXEL_VERS := ABTO
+ SUPPORTED_DEVICES += zyxel,gs1900-24ep
DEVICE_PACKAGES += realtek-poe
endef
-TARGET_DEVICES += zyxel_gs1900-24ep
+TARGET_DEVICES += zyxel_gs1900-24ep-a1
-define Device/zyxel_gs1900-24hp-v1
+define Device/zyxel_gs1900-24hp-a1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-24HP
- DEVICE_VARIANT := v1
+ DEVICE_VARIANT := A1
ZYXEL_VERS := AAHM
+ SUPPORTED_DEVICES += zyxel,gs1900-24hp-v1
DEVICE_PACKAGES += realtek-poe
endef
-TARGET_DEVICES += zyxel_gs1900-24hp-v1
+TARGET_DEVICES += zyxel_gs1900-24hp-a1
-define Device/zyxel_gs1900-24hp-v2
+define Device/zyxel_gs1900-24hp-b1
$(Device/zyxel_gs1900)
SOC := rtl8382
DEVICE_MODEL := GS1900-24HP
- DEVICE_VARIANT := v2
+ DEVICE_VARIANT := B1
ZYXEL_VERS := ABTP
+ SUPPORTED_DEVICES += zyxel,gs1900-24hp-v2
DEVICE_PACKAGES += realtek-poe
endef
-TARGET_DEVICES += zyxel_gs1900-24hp-v2
+TARGET_DEVICES += zyxel_gs1900-24hp-b1
More information about the lede-commits
mailing list