hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-11 15:12:10 -05:00
Code Issues Projects Releases Wiki Activity

realtek: rtl838x: rename GS1900 series v1/v2 to A1/B1

Browse Source 
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@volatilesystems.org>
Link: https://github.com/openwrt/openwrt/pull/20118
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Stijn Segers 2025-09-04 20:26:08 +02:00 committed by Robert Marko
parent dafc49b233
commit d205878ede
12 changed files with 66 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts → target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-10hp", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-10hp-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-10HP Switch"; model = "Zyxel GS1900-10HP A1 Switch";
/* i2c of the left SFP cage: port 9 */ /* i2c of the left SFP cage: port 9 */
i2c0: i2c-gpio-0 { i2c0: i2c-gpio-0 {

4
target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v1.dts → target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio_emulated.dtsi" #include "rtl8380_zyxel_gs1900_gpio_emulated.dtsi"
/ { / {
compatible = "zyxel,gs1900-8-v1", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-8-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-8 v1 Switch"; model = "Zyxel GS1900-8 A1 Switch";
}; };
&gpio1 { &gpio1 {

4
target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-v2.dts → target/linux/realtek/dts/rtl8380_zyxel_gs1900-8-b1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-8-v2", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-8-b1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-8 v2 Switch"; model = "Zyxel GS1900-8 B1 Switch";
}; };
&gpio1 { &gpio1 {

4
target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v2.dts → target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-8hp-v2", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-8hp-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-8HP v2 Switch"; model = "Zyxel GS1900-8HP A1 Switch";
}; };
&uart1 { &uart1 {

4
target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-v1.dts → target/linux/realtek/dts/rtl8380_zyxel_gs1900-8hp-b1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-8hp-v1", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-8hp-b1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-8HP v1 Switch"; model = "Zyxel GS1900-8HP B1 Switch";
}; };
&uart1 { &uart1 {

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-16-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-16", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-16-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-16"; model = "Zyxel GS1900-16 A1";
}; };
&mdio_bus0 { &mdio_bus0 {

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-24-v1", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-24-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-24 v1"; model = "Zyxel GS1900-24 A1";
memory@0 { memory@0 {
reg = <0x0 0x4000000>; reg = <0x0 0x4000000>;

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-24e", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-24e-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-24E"; model = "Zyxel GS1900-24E A1";
}; };
&mdio_bus0 { &mdio_bus0 {

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-24ep", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-24ep-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-24EP Switch"; model = "Zyxel GS1900-24EP A1 Switch";
}; };
&uart1 { &uart1 {

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-24hp-v1", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-24hp-a1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-24HP v1"; model = "Zyxel GS1900-24HP A1";
memory@0 { memory@0 {
reg = <0x0 0x4000000>; reg = <0x0 0x4000000>;

4
target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts → target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
View File

@ -4,8 +4,8 @@
#include "rtl8380_zyxel_gs1900_gpio.dtsi" #include "rtl8380_zyxel_gs1900_gpio.dtsi"
/ { / {
compatible = "zyxel,gs1900-24hp-v2", "realtek,rtl838x-soc"; compatible = "zyxel,gs1900-24hp-b1", "realtek,rtl838x-soc";
model = "Zyxel GS1900-24HP v2 Switch"; model = "Zyxel GS1900-24HP B1 Switch";
/* i2c of the left SFP cage: port 25 */ /* i2c of the left SFP cage: port 25 */
i2c0: i2c-gpio-0 { i2c0: i2c-gpio-0 {

75
target/linux/realtek/image/rtl838x.mk
View File

@ -345,105 +345,118 @@ define Device/tplink_t1600g-28ts-v3
endef endef
TARGET_DEVICES += tplink_t1600g-28ts-v3 TARGET_DEVICES += tplink_t1600g-28ts-v3
define Device/zyxel_gs1900-10hp define Device/zyxel_gs1900-10hp-a1
$(Device/zyxel_gs1900) $(Device/zyxel_gs1900)
SOC := rtl8380 SOC := rtl8380
DEVICE_MODEL := GS1900-10HP DEVICE_MODEL := GS1900-10HP
DEVICE_VARIANT := A1
ZYXEL_VERS := AAZI ZYXEL_VERS := AAZI
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
SUPPORTED_DEVICES += zyxel,gs1900-10hp
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-16 DEVICE_MODEL := GS1900-16
DEVICE_VARIANT := A1
ZYXEL_VERS := AAHJ ZYXEL_VERS := AAHJ
SUPPORTED_DEVICES += zyxel,gs1900-16
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8380 SOC := rtl8380
DEVICE_MODEL := GS1900-8 DEVICE_MODEL := GS1900-8
DEVICE_VARIANT := v1 DEVICE_VARIANT := A1
ZYXEL_VERS := AAHH ZYXEL_VERS := AAHH
SUPPORTED_DEVICES += zyxel,gs1900-8 SUPPORTED_DEVICES += zyxel,gs1900-8 zyxel,gs1900-8-v1
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8380 SOC := rtl8380
DEVICE_MODEL := GS1900-8 DEVICE_MODEL := GS1900-8
DEVICE_VARIANT := v2 DEVICE_VARIANT := B1
ZYXEL_VERS := AAHH ZYXEL_VERS := AAHH
SUPPORTED_DEVICES += zyxel,gs1900-8 SUPPORTED_DEVICES += zyxel,gs1900-8 zyxel,gs1900-8-v2
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8380 SOC := rtl8380
DEVICE_MODEL := GS1900-8HP DEVICE_MODEL := GS1900-8HP
DEVICE_VARIANT := v1 DEVICE_VARIANT := A1
ZYXEL_VERS := AAHI ZYXEL_VERS := AAHI
SUPPORTED_DEVICES += zyxel,gs1900-8hp-v1
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8380 SOC := rtl8380
DEVICE_MODEL := GS1900-8HP DEVICE_MODEL := GS1900-8HP
DEVICE_VARIANT := v2 DEVICE_VARIANT := B1
ZYXEL_VERS := AAHI ZYXEL_VERS := AAHI
SUPPORTED_DEVICES += zyxel,gs1900-8hp-v2
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-24 DEVICE_MODEL := GS1900-24
DEVICE_VARIANT := v1 DEVICE_VARIANT := A1
ZYXEL_VERS := AAHL ZYXEL_VERS := AAHL
SUPPORTED_DEVICES += zyxel,gs1900-24-v1
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-24E DEVICE_MODEL := GS1900-24E
DEVICE_VARIANT := A1
ZYXEL_VERS := AAHK ZYXEL_VERS := AAHK
SUPPORTED_DEVICES += zyxel,gs1900-24e
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-24EP DEVICE_MODEL := GS1900-24EP
DEVICE_VARIANT := A1
ZYXEL_VERS := ABTO ZYXEL_VERS := ABTO
SUPPORTED_DEVICES += zyxel,gs1900-24ep
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-24HP DEVICE_MODEL := GS1900-24HP
DEVICE_VARIANT := v1 DEVICE_VARIANT := A1
ZYXEL_VERS := AAHM ZYXEL_VERS := AAHM
SUPPORTED_DEVICES += zyxel,gs1900-24hp-v1
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
endef 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) $(Device/zyxel_gs1900)
SOC := rtl8382 SOC := rtl8382
DEVICE_MODEL := GS1900-24HP DEVICE_MODEL := GS1900-24HP
DEVICE_VARIANT := v2 DEVICE_VARIANT := B1
ZYXEL_VERS := ABTP ZYXEL_VERS := ABTP
SUPPORTED_DEVICES += zyxel,gs1900-24hp-v2
DEVICE_PACKAGES += realtek-poe DEVICE_PACKAGES += realtek-poe
endef endef
TARGET_DEVICES += zyxel_gs1900-24hp-v2 TARGET_DEVICES += zyxel_gs1900-24hp-b1