From: Jonas Jelonek Date: Wed, 15 Apr 2026 21:37:45 +0000 (+0000) Subject: realtek: dts: rtl93xx: replace LED magic values with macros X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0136c48bd5006945630b167b2ecdfb8635bebdc9;p=thirdparty%2Fopenwrt.git realtek: dts: rtl93xx: replace LED magic values with macros Replace the raw bitmask values for led_set entries with the RTL93XX_LED_SET_* macros from macros.dtsi to make the LED configuration self-explanatory. Signed-off-by: Jonas Jelonek Link: https://github.com/openwrt/openwrt/pull/23118 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi index bad08f29a63..e1feaff9f4f 100644 --- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi +++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-common.dtsi @@ -52,10 +52,24 @@ compatible = "realtek,rtl9300-leds"; active-low; - led_set0 = <0x0a20 0x0b80>; // LED set 0: 1000Mbps, 10/100Mbps - led_set1 = <0x0a0b 0x0a28 0x0a82 0x0a0b>; // LED set 1: (10G, 5G, 2.5G) (2.5G, 1G) - // (5G, 10/100) (10G, 5G, 2.5G) - led_set2 = <0x0a20 0x0a01>; // LED set 2: 1000MBit, 10GBit + /* [Lime] [Amber] */ + led_set0 = <(RTL93XX_LED_SET_1G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT)>; + + /* [Blue?] [Lime] [Amber] [Green?] */ + led_set1 = <(RTL93XX_LED_SET_10G | RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_1G | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_5G | RTL93XX_LED_SET_100M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; + + /* [Lime] [Blue] */ + led_set2 = <(RTL93XX_LED_SET_1G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; thermal-zones { diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi b/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi index 4b356d9e8ae..efe600ad551 100644 --- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi +++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1x10-12-common.dtsi @@ -51,24 +51,23 @@ compatible = "realtek,rtl9300-leds"; active-low; - // LED set 0: - // Amber: 100M/10M - // Yellow: 1G - led_set0 = <0x0a20 0x0b80>; - - // LED set 1: - // Blue: 2.5G - // Green: 2.5G - // Yellow: 1G - // Amber: 100M/10M - // (Blue + Green = Cyan) - led_set1 = <0x0b80 0x0a20 0x0a08 0x0a08>; - - // LED set 2: - // Blue: 10G/5G/2.5G - // Yellow: 5G/2.5G/1G - // (Blue + Yellow = Purple) - led_set2 = <0x0a2a 0x0a0b>; + /* [Green] [Amber] */ + led_set0 = <(RTL93XX_LED_SET_1G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT)>; + + /* [Amber] [Lime] [Green] [Blue] */ + led_set1 = <(RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_1G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; + + /* [Lime] [Blue] */ + led_set2 = <(RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_1G | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; }; diff --git a/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts b/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts index 9d0187adb8c..6c1bb9f4697 100644 --- a/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts +++ b/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts @@ -53,14 +53,18 @@ active-low; /* - * LED set 0 - * - * - LED[0](Amber): 5G/LINK/ACT - * - LED[1](Green): 10G/LINK/ACT - * - LED[2](Amber): 1G/100M/10M/LINK/ACT - * - LED[3](Green): 2.5G/LINK/ACT - */ - led_set0 = <0x0a02 0x0a01 0x0ba0 0x0a08>; + * LED set 0 + * + * - LED[0](Amber): 5G/LINK/ACT + * - LED[1](Green): 10G/LINK/ACT + * - LED[2](Amber): 1G/100M/10M/LINK/ACT + * - LED[3](Green): 2.5G/LINK/ACT + */ + led_set0 = <(RTL93XX_LED_SET_5G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_1G | RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; }; diff --git a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts index cd63dc24f33..d11a6fd30a7 100644 --- a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts +++ b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts @@ -52,7 +52,10 @@ compatible = "realtek,rtl9300-leds"; active-high; - led_set0 = <0x0ba0 0x0a08 0x0a01>; + led_set0 = <(RTL93XX_LED_SET_1G | RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; i2c_gpio { diff --git a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts index 282fa554def..7eb2ea50c5b 100644 --- a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts +++ b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts @@ -34,12 +34,9 @@ compatible = "realtek,rtl9300-leds"; active-low; - /* - * LED set 0 - * - * - LED[0](Green): 10M/100M/1G/2.5G/5G/10G/LINK/ACT - */ - led_set0 = <0x0bab>; + led_set0 = <(RTL93XX_LED_SET_10G | RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | + RTL93XX_LED_SET_1G | RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | + RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; sfp0: sfp-p1 { diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts index fab9cefbda8..b76c2e69d51 100644 --- a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts +++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts @@ -57,7 +57,10 @@ * - LED[0](Green): 10G/LINK/ACT * - LED[1](Amber): 10M/100M/1G/2.5G/5G/LINK/ACT */ - led_set0 = <0x0baa 0x0a01>; + led_set0 = <(RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_1G | + RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_10G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT)>; }; sfp0: sfp-p1 { diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts index bca93c9c7c1..4c9bbfea91c 100644 --- a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts +++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts @@ -44,7 +44,10 @@ * - LED[0](Green): 10G/LINK/ACT * - LED[1](Amber): 10M/100M/1G/2.5G/5G/LINK/ACT */ - led_set0 = <0x0a01 0x0baa>; + led_set0 = <(RTL93XX_LED_SET_10G | RTL93XX_LED_SET_LINK | RTL93XX_LED_SET_ACT) + (RTL93XX_LED_SET_5G | RTL93XX_LED_SET_2P5G | RTL93XX_LED_SET_1G | + RTL93XX_LED_SET_100M | RTL93XX_LED_SET_10M | RTL93XX_LED_SET_LINK | + RTL93XX_LED_SET_ACT)>; }; sfp0: sfp-p1 {