[openwrt/openwrt] realtek: move common GS1920-24HP parts to common definitions
LEDE Commits
lede-commits at lists.infradead.org
Fri Feb 13 14:34:11 PST 2026
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/b449b8cd3ab53e7b99aa4b1a5727bd4cb7ca6e07
commit b449b8cd3ab53e7b99aa4b1a5727bd4cb7ca6e07
Author: Jonas Jelonek <jelonek.jonas at gmail.com>
AuthorDate: Wed Oct 29 20:36:20 2025 +0000
realtek: move common GS1920-24HP parts to common definitions
Move common parts shared with GS1920-24HPv2 from v1's DTS and image
definition into a common DTSI and device definition to prepare adding
support for GS1920-24HPv2.
Signed-off-by: Jonas Jelonek <jelonek.jonas at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21944
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts | 280 ++-------------------
...1.dts => rtl839x_zyxel_gs1920-24hp-common.dtsi} | 83 +-----
target/linux/realtek/image/rtl839x.mk | 14 +-
3 files changed, 38 insertions(+), 339 deletions(-)
diff --git a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts b/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
index 8df43cea60..afec061262 100644
--- a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
+++ b/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
@@ -1,22 +1,11 @@
/dts-v1/;
-#include "rtl839x.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/leds/common.h>
+#include "rtl839x_zyxel_gs1920-24hp-common.dtsi"
/ {
compatible = "zyxel,gs1920-24hp-v1", "realtek,rtl8392-soc";
model = "Zyxel GS1920-24HPv1";
- aliases {
- led-boot = &led_sys;
- led-failsafe = &led_sys;
- led-running = &led_sys;
- led-upgrade = &led_sys;
- };
-
memory at 0 {
device_type = "memory";
reg = <0x0 0x8000000>;
@@ -26,29 +15,12 @@
stdout-path = "serial0:9600n8";
};
-
leds {
- pinctrl-names = "default";
- pinctrl-0 = <&pinmux_disable_sys_led>;
- compatible = "gpio-leds";
-
- led_sys: sys {
- gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
- function = LED_FUNCTION_STATUS;
- color = <LED_COLOR_ID_GREEN>;
- };
-
alarm {
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
function = LED_FUNCTION_FAULT;
color = <LED_COLOR_ID_RED>;
};
-
- locator {
- gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
- function = LED_FUNCTION_INDICATOR;
- color = <LED_COLOR_ID_BLUE>;
- };
};
keys {
@@ -61,260 +33,56 @@
linux,code = <KEY_RESTART>;
};
};
+};
- /* i2c of the lower left SFP cage: port 25 */
- i2c0: i2c-gpio-0 {
- compatible = "i2c-gpio";
- sda-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- i2c-gpio,delay-us = <2>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
-
- sfp0: sfp-p25 {
- compatible = "sff,sfp";
- i2c-bus = <&i2c0>;
- los-gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>;
- mod-def0-gpio = <&gpio0 23 GPIO_ACTIVE_LOW>;
- tx-fault-gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
- };
-
- /* i2c of the upper left SFP cage: port 26 */
- i2c1: i2c-gpio-1 {
- compatible = "i2c-gpio";
- sda-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- i2c-gpio,delay-us = <2>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
-
- sfp1: sfp-p26 {
- compatible = "sff,sfp";
- i2c-bus = <&i2c1>;
- los-gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
- mod-def0-gpio = <&gpio0 17 GPIO_ACTIVE_LOW>;
- tx-fault-gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>;
- };
-
- /* i2c of the lower right SFP cage: port 27 */
- i2c2: i2c-gpio-2 {
- compatible = "i2c-gpio";
- sda-gpios = <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- i2c-gpio,delay-us = <2>;
- #address-cells = <1>;
- #size-cells = <0>;
- };
-
- sfp2: sfp-p27 {
- compatible = "sff,sfp";
- i2c-bus = <&i2c2>;
- los-gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
- mod-def0-gpio = <&gpio0 13 GPIO_ACTIVE_LOW>;
- tx-fault-gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+&i2c4 {
+ adt7468: adt7468 at 2e {
+ compatible = "adi,adt7468";
+ reg = <0x2e>;
};
+};
- /* i2c of the upper right SFP cage: port 28 */
- i2c3: i2c-gpio-3 {
- compatible = "i2c-gpio";
- sda-gpios = <&gpio1 22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio1 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- i2c-gpio,delay-us = <2>;
- #address-cells = <1>;
- #size-cells = <0>;
+&flash_partitions {
+ partition at 20000 {
+ label = "reserved";
+ reg = <0x20000 0x90000>;
+ read-only;
};
- sfp3: sfp-p28 {
- compatible = "sff,sfp";
- i2c-bus = <&i2c3>;
- los-gpio = <&gpio1 29 GPIO_ACTIVE_HIGH>;
- mod-def0-gpio = <&gpio0 20 GPIO_ACTIVE_LOW>;
- tx-fault-gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;
- };
+ partition at b0000 {
+ reg = <0xb0000 0xf50000>;
+ label = "factory";
- /* i2c for hwmon/PoE */
- i2c4: i2c-gpio-4 {
- compatible = "i2c-gpio";
- sda-gpios = <&gpio0 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- scl-gpios = <&gpio0 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- i2c-gpio,delay-us = <2>;
+ compatible = "fixed-partitions";
#address-cells = <1>;
- #size-cells = <0>;
+ #size-cells = <1>;
- adt7468: adt7468 at 2e {
- compatible = "adi,adt7468";
- reg = <0x2e>;
+ partition at 0 {
+ label = "loader";
+ reg = <0x0 0x10000>;
};
- };
-};
-
-&spi0 {
- status = "okay";
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <10000000>;
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootbase";
- reg = <0x0 0x20000>;
- read-only;
-
- nvmem-layout {
- compatible = "fixed-layout";
- #address-cells = <1>;
- #size-cells = <1>;
-
- factory_macaddr: macaddr at 1fff8 {
- reg = <0x1fff8 0x6>;
- };
- };
- };
-
- partition at 20000 {
- label = "reserved";
- reg = <0x20000 0x90000>;
- read-only;
- };
-
- partition at b0000 {
- reg = <0xb0000 0xf50000>;
- label = "factory";
-
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "loader";
- reg = <0x0 0x10000>;
- };
-
- partition at 10000 {
- label = "firmware";
- reg = <0x10000 0xf40000>;
- compatible = "openwrt,uimage", "denx,uimage";
- };
- };
+ partition at 10000 {
+ label = "firmware";
+ reg = <0x10000 0xf40000>;
+ compatible = "openwrt,uimage", "denx,uimage";
};
};
};
-ðernet0 {
- nvmem-cells = <&factory_macaddr>;
- nvmem-cell-names = "mac-address";
-};
-
&mdio_bus0 {
- /* External phy RTL8218B #1 */
- EXTERNAL_PHY(0)
- EXTERNAL_PHY(1)
- EXTERNAL_PHY(2)
- EXTERNAL_PHY(3)
- EXTERNAL_PHY(4)
- EXTERNAL_PHY(5)
- EXTERNAL_PHY(6)
- EXTERNAL_PHY(7)
-
- /* External phy RTL8218B #2 */
- EXTERNAL_PHY(8)
- EXTERNAL_PHY(9)
- EXTERNAL_PHY(10)
- EXTERNAL_PHY(11)
- EXTERNAL_PHY(12)
- EXTERNAL_PHY(13)
- EXTERNAL_PHY(14)
- EXTERNAL_PHY(15)
-
- /* External phy RTL8218B #3 */
- EXTERNAL_PHY(16)
- EXTERNAL_PHY(17)
- EXTERNAL_PHY(18)
- EXTERNAL_PHY(19)
- EXTERNAL_PHY(20)
- EXTERNAL_PHY(21)
- EXTERNAL_PHY(22)
- EXTERNAL_PHY(23)
-
/* External phy RTL8214FC #1 */
EXTERNAL_SFP_PHY_FULL(48, 0)
EXTERNAL_SFP_PHY_FULL(49, 1)
EXTERNAL_SFP_PHY_FULL(50, 2)
EXTERNAL_SFP_PHY_FULL(51, 3)
-
};
&switch0 {
ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- SWITCH_PORT_SDS(0, 1, 0, qsgmii)
- SWITCH_PORT_SDS(1, 2, 0, qsgmii)
- SWITCH_PORT_SDS(2, 3, 0, qsgmii)
- SWITCH_PORT_SDS(3, 4, 0, qsgmii)
- SWITCH_PORT_SDS(4, 5, 1, qsgmii)
- SWITCH_PORT_SDS(5, 6, 1, qsgmii)
- SWITCH_PORT_SDS(6, 7, 1, qsgmii)
- SWITCH_PORT_SDS(7, 8, 1, qsgmii)
-
- SWITCH_PORT_SDS(8, 9, 2, qsgmii)
- SWITCH_PORT_SDS(9, 10, 2, qsgmii)
- SWITCH_PORT_SDS(10, 11, 2, qsgmii)
- SWITCH_PORT_SDS(11, 12, 2, qsgmii)
- SWITCH_PORT_SDS(12, 13, 3, qsgmii)
- SWITCH_PORT_SDS(13, 14, 3, qsgmii)
- SWITCH_PORT_SDS(14, 15, 3, qsgmii)
- SWITCH_PORT_SDS(15, 16, 3, qsgmii)
-
- SWITCH_PORT_SDS(16, 17, 4, qsgmii)
- SWITCH_PORT_SDS(17, 18, 4, qsgmii)
- SWITCH_PORT_SDS(18, 19, 4, qsgmii)
- SWITCH_PORT_SDS(19, 20, 4, qsgmii)
- SWITCH_PORT_SDS(20, 21, 5, qsgmii)
- SWITCH_PORT_SDS(21, 22, 5, qsgmii)
- SWITCH_PORT_SDS(22, 23, 5, qsgmii)
- SWITCH_PORT_SDS(23, 24, 5, qsgmii)
-
SWITCH_PORT_SDS(48, 25, 12, qsgmii)
SWITCH_PORT_SDS(49, 26, 12, qsgmii)
SWITCH_PORT_SDS(50, 27, 12, qsgmii)
SWITCH_PORT_SDS(51, 28, 12, qsgmii)
-
- /* CPU-Port */
- port at 52 {
- ethernet = <ðernet0>;
- reg = <52>;
- phy-mode = "internal";
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
- };
- };
-};
-
-&mdio_aux {
- status = "okay";
-
- gpio1: expander at 3 {
- compatible = "realtek,rtl8231";
- reg = <3>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&gpio1 0 0 37>;
-
- led-controller {
- compatible = "realtek,rtl8231-leds";
- status = "disabled";
- };
};
};
diff --git a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts b/target/linux/realtek/dts/rtl839x_zyxel_gs1920-24hp-common.dtsi
similarity index 76%
copy from target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
copy to target/linux/realtek/dts/rtl839x_zyxel_gs1920-24hp-common.dtsi
index 8df43cea60..f05e032e03 100644
--- a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
+++ b/target/linux/realtek/dts/rtl839x_zyxel_gs1920-24hp-common.dtsi
@@ -7,9 +7,6 @@
#include <dt-bindings/leds/common.h>
/ {
- compatible = "zyxel,gs1920-24hp-v1", "realtek,rtl8392-soc";
- model = "Zyxel GS1920-24HPv1";
-
aliases {
led-boot = &led_sys;
led-failsafe = &led_sys;
@@ -17,16 +14,6 @@
led-upgrade = &led_sys;
};
- memory at 0 {
- device_type = "memory";
- reg = <0x0 0x8000000>;
- };
-
- chosen {
- stdout-path = "serial0:9600n8";
- };
-
-
leds {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_disable_sys_led>;
@@ -38,12 +25,6 @@
color = <LED_COLOR_ID_GREEN>;
};
- alarm {
- gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
- function = LED_FUNCTION_FAULT;
- color = <LED_COLOR_ID_RED>;
- };
-
locator {
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
function = LED_FUNCTION_INDICATOR;
@@ -51,18 +32,7 @@
};
};
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
-
- mode {
- label = "reset";
- gpios = <&gpio1 32 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-
- /* i2c of the lower left SFP cage: port 25 */
+ /* i2c of port 25 SFP cage */
i2c0: i2c-gpio-0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -80,7 +50,7 @@
tx-fault-gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
};
- /* i2c of the upper left SFP cage: port 26 */
+ /* i2c of port 26 SFP cage */
i2c1: i2c-gpio-1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio1 10 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -98,7 +68,7 @@
tx-fault-gpio = <&gpio1 6 GPIO_ACTIVE_HIGH>;
};
- /* i2c of the lower right SFP cage: port 27 */
+ /* i2c of port 27 SFP cage */
i2c2: i2c-gpio-2 {
compatible = "i2c-gpio";
sda-gpios = <&gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -116,7 +86,7 @@
tx-fault-gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
};
- /* i2c of the upper right SFP cage: port 28 */
+ /* i2c of port 28 SFP cage */
i2c3: i2c-gpio-3 {
compatible = "i2c-gpio";
sda-gpios = <&gpio1 22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -142,11 +112,6 @@
i2c-gpio,delay-us = <2>;
#address-cells = <1>;
#size-cells = <0>;
-
- adt7468: adt7468 at 2e {
- compatible = "adi,adt7468";
- reg = <0x2e>;
- };
};
};
@@ -157,7 +122,7 @@
reg = <0>;
spi-max-frequency = <10000000>;
- partitions {
+ flash_partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
@@ -177,32 +142,6 @@
};
};
};
-
- partition at 20000 {
- label = "reserved";
- reg = <0x20000 0x90000>;
- read-only;
- };
-
- partition at b0000 {
- reg = <0xb0000 0xf50000>;
- label = "factory";
-
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "loader";
- reg = <0x0 0x10000>;
- };
-
- partition at 10000 {
- label = "firmware";
- reg = <0x10000 0xf40000>;
- compatible = "openwrt,uimage", "denx,uimage";
- };
- };
};
};
};
@@ -242,13 +181,6 @@
EXTERNAL_PHY(21)
EXTERNAL_PHY(22)
EXTERNAL_PHY(23)
-
- /* External phy RTL8214FC #1 */
- EXTERNAL_SFP_PHY_FULL(48, 0)
- EXTERNAL_SFP_PHY_FULL(49, 1)
- EXTERNAL_SFP_PHY_FULL(50, 2)
- EXTERNAL_SFP_PHY_FULL(51, 3)
-
};
&switch0 {
@@ -283,11 +215,6 @@
SWITCH_PORT_SDS(22, 23, 5, qsgmii)
SWITCH_PORT_SDS(23, 24, 5, qsgmii)
- SWITCH_PORT_SDS(48, 25, 12, qsgmii)
- SWITCH_PORT_SDS(49, 26, 12, qsgmii)
- SWITCH_PORT_SDS(50, 27, 12, qsgmii)
- SWITCH_PORT_SDS(51, 28, 12, qsgmii)
-
/* CPU-Port */
port at 52 {
ethernet = <ðernet0>;
diff --git a/target/linux/realtek/image/rtl839x.mk b/target/linux/realtek/image/rtl839x.mk
index c07252eb48..6afa80b49d 100644
--- a/target/linux/realtek/image/rtl839x.mk
+++ b/target/linux/realtek/image/rtl839x.mk
@@ -98,19 +98,15 @@ define Device/zyxel_gs1900-48-a1
endef
TARGET_DEVICES += zyxel_gs1900-48-a1
-define Device/zyxel_gs1920-24hp-v1
- FLASH_ADDR := 0xb40c0000
+define Device/zyxel_gs1920-24hp
ifeq ($(IB),)
ARTIFACTS := loader.bin
ARTIFACT/loader.bin := \
rt-loader-standalone | \
zynsig
endif
- SOC := rtl8392
- IMAGE_SIZE := 12144k
DEVICE_VENDOR := Zyxel
DEVICE_MODEL := GS1920-24HP
- DEVICE_VARIANT := v1
DEVICE_PACKAGES := \
kmod-hwmon-lm85
KERNEL := \
@@ -124,4 +120,12 @@ endif
rt-compress | \
rt-loader
endef
+
+define Device/zyxel_gs1920-24hp-v1
+ $(Device/zyxel_gs1920-24hp)
+ SOC := rtl8392
+ FLASH_ADDR := 0xb40c0000
+ IMAGE_SIZE := 12144k
+ DEVICE_VARIANT := v1
+endef
TARGET_DEVICES += zyxel_gs1920-24hp-v1
More information about the lede-commits
mailing list