ath79: qca953x: use led-sources for WMAC

The ath9k driver creates an ath9k LED by default. Instead of having a
non functional LED, configure it properly and remove the extra as it's
not needed.

It's also a bit funny matching against phy0 and phy1 when both differ
between ath9k and ath10k.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23191
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rosen Penev 2025-05-24 16:02:54 -07:00 committed by Robert Marko
parent c6c2ebdb61
commit 7e42df1e42
27 changed files with 130 additions and 191 deletions

View File

@ -65,13 +65,6 @@
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
watchdog {
@ -191,4 +184,9 @@
nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <0>;
led-active-low;
};
};

View File

@ -34,13 +34,6 @@
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
keys {
@ -158,4 +151,9 @@
nvmem-cells = <&macaddr_art_0 3>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <14>;
led-active-low;
};
};

View File

@ -27,9 +27,3 @@
function = LED_FUNCTION_STATUS;
color = <LED_COLOR_ID_RED>;
};
&led_wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
};

View File

@ -64,13 +64,6 @@
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
};
led_wlan: wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_RED>;
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
i2c: i2c {
@ -188,6 +181,11 @@
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <14>;
led-active-low;
};
};
&pinmux {

View File

@ -26,12 +26,6 @@
leds {
compatible = "gpio-leds";
wlan2g {
label = "green:wlan2g";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
wan {
function = LED_FUNCTION_WAN;
color = <LED_COLOR_ID_GREEN>;
@ -157,4 +151,9 @@
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <4>;
led-active-low;
};
};

View File

@ -58,13 +58,6 @@
color = <LED_COLOR_ID_GREEN>;
};
wlan {
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
linux,default-trigger = "phy0tpt";
};
lte {
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
label = "green:lte";
@ -179,4 +172,9 @@
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <12>;
led-active-low;
};
};

View File

@ -9,15 +9,6 @@
compatible = "qxwlan,e600g-v2-16m", "qca,qca9531";
};
&leds {
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
&partitions {
partition@70000 {
compatible = "denx,uimage";
@ -26,6 +17,13 @@
};
};
&wmac {
led {
led-sources = <4>;
led-active-low;
};
};
&pcie0 {
/delete-node/ wifi@0,0;
};

View File

@ -9,15 +9,6 @@
compatible = "qxwlan,e600g-v2-8m", "qca,qca9531";
};
&leds {
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
&partitions {
partition@70000 {
compatible = "denx,uimage";
@ -26,6 +17,13 @@
};
};
&wmac {
led {
led-sources = <4>;
led-active-low;
};
};
&pcie0 {
/delete-node/ wifi@0,0;
};

View File

@ -45,13 +45,6 @@
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
led_rssi0: rssi0 {
label = "blue:rssi0";
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
@ -154,6 +147,11 @@
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <0>;
led-active-low;
};
};
&pinmux {

View File

@ -96,13 +96,6 @@
gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
usb {
function = LED_FUNCTION_USB;
color = <LED_COLOR_ID_GREEN>;
@ -212,6 +205,11 @@
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <6>;
led-active-low;
};
};
&usb0 {

View File

@ -41,14 +41,6 @@
gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
};
/* D3 */
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_WHITE>;
gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tpt";
};
/* D2 */
led_power: power {
function = LED_FUNCTION_POWER;
@ -170,6 +162,10 @@
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <11>;
};
};
&usb0 {

View File

@ -33,12 +33,6 @@
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
};
wlan2g {
label = "green:wlan2g";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
usb {
function = LED_FUNCTION_USB;
color = <LED_COLOR_ID_GREEN>;
@ -191,6 +185,11 @@
nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <11>;
led-active-low;
};
};
&pcie0 {

View File

@ -56,17 +56,6 @@
};
};
ath9k-leds {
compatible = "gpio-leds";
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
keys {
compatible = "gpio-keys";
@ -178,4 +167,9 @@
nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <0>;
led-active-low;
};
};

View File

@ -55,12 +55,6 @@
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
wifi {
label = "white:wifi";
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
internet_green {
label = "green:internet";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
@ -196,4 +190,9 @@
nvmem-cells = <&calibration_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <2>;
led-active-low;
};
};

View File

@ -38,13 +38,6 @@
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
rssilow {
label = "green:rssilow";
gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
@ -75,6 +68,11 @@
status = "okay";
qca,no-eeprom;
led {
led-sources = <11>;
led-active-low;
};
};
&eth0 {

View File

@ -33,13 +33,6 @@
gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tpt";
};
led_user: user {
label = "green:user";
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
@ -51,6 +44,10 @@
status = "okay";
qca,no-eeprom;
led {
led-sources = <11>;
};
};
&eth0 {

View File

@ -26,13 +26,6 @@
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
led_user: user {
label = "green:user";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
@ -44,6 +37,11 @@
status = "okay";
qca,no-eeprom;
led {
led-sources = <11>;
led-active-low;
};
};
&eth0 {

View File

@ -33,13 +33,6 @@
label = "green:rssihigh";
gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tpt";
};
};
gpio-export {
@ -57,6 +50,10 @@
status = "okay";
qca,no-eeprom;
led {
led-sources = <14>;
};
};
&eth0 {

View File

@ -42,12 +42,6 @@
default-state = "on";
};
wifi_green {
label = "green:wifi";
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
wifi_yellow {
label = "yellow:wifi";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
@ -179,4 +173,9 @@
nvmem-cells = <&macaddr_art_0 2>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <2>;
led-active-low;
};
};

View File

@ -24,13 +24,6 @@
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
lan1 {
label = "green:lan1";
gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@ -112,6 +105,11 @@
&wmac {
status = "okay";
led {
led-sources = <12>;
led-active-low;
};
};
&usb0 {

View File

@ -29,13 +29,6 @@
gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
led_system: system {
label = "green:system";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
@ -138,4 +131,9 @@
nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <12>;
led-active-low;
};
};

View File

@ -59,13 +59,6 @@
label = "blue:signal5";
gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_BLUE>;
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
keys {
@ -184,4 +177,9 @@
nvmem-cells = <&macaddr_info_8>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <13>;
led-active-low;
};
};

View File

@ -14,13 +14,6 @@
leds: leds {
compatible = "gpio-leds";
wifi {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
led_qss: qss {
label = "green:qss";
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
@ -147,4 +140,9 @@
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <13>;
led-active-low;
};
};

View File

@ -21,12 +21,6 @@
leds {
compatible = "gpio-leds";
wifi {
label = "green:wifi";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
led_power: power {
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_GREEN>;
@ -172,4 +166,9 @@
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <15>;
led-active-low;
};
};

View File

@ -28,13 +28,6 @@
default-state = "on";
};
wifi {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
qss {
label = "green:qss";
gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
@ -183,4 +176,9 @@
nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
nvmem-cell-names = "mac-address", "calibration";
led {
led-sources = <3>;
led-active-low;
};
};

View File

@ -36,12 +36,6 @@
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
wlan2g {
label = "blue:wlan2g";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
};
@ -121,4 +115,9 @@
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <13>;
led-active-low;
};
};

View File

@ -38,13 +38,6 @@
default-state = "on";
};
wlan {
function = LED_FUNCTION_WLAN;
color = <LED_COLOR_ID_GREEN>;
gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "phy0tpt";
};
link1 {
label = "green:signal0";
color = <LED_COLOR_ID_GREEN>;
@ -150,4 +143,8 @@
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
led {
led-sources = <12>;
};
};