diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts index 3ec3a4fe619..bf776b53b19 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts @@ -122,7 +122,7 @@ &pcie0 { status = "okay"; - ath9k0: wifi@11,0 { + wifi@11,0 { compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 1>; nvmem-cell-names = "mac-address"; @@ -131,7 +131,7 @@ gpio-controller; }; - ath9k1: wifi@12,0 { + wifi@12,0 { compatible = "pci168c,0029"; nvmem-cells = <&macaddr_hwinfo_1c 2>; nvmem-cell-names = "mac-address"; diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts index 800d32611d5..1d64c708597 100644 --- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts +++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts @@ -63,12 +63,6 @@ color = ; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - - wifi { - label = "blue:wifi"; - gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy0tpt"; - }; }; }; @@ -170,4 +164,8 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <0>; + }; }; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts index ce69422c81b..90ed01ceec7 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts +++ b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts @@ -74,13 +74,6 @@ label = "green:minipcie"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; }; leds-pcf8574 { @@ -118,6 +111,13 @@ nvmem-cell-names = "mac-address"; }; +&wmac { + led { + led-sources = <12>; + led-active-low; + }; +}; + &pcie0 { status = "okay"; }; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts index fc2aa19324f..b0d06471201 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts +++ b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts @@ -38,13 +38,6 @@ trigger-sources = <&gl850g_port1>, <&gl850g_port2>, <&gl850g_port3>, <&gl850g_port4>; }; - - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; }; }; @@ -57,6 +50,13 @@ compatible = "syscon", "simple-mfd"; }; +&wmac { + led { + led-sources = <12>; + led-active-low; + }; +}; + &gpio_export { usb-power { gpio-export,name = "usb-power"; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts index 698f028df81..c1e95242ec7 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts +++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts @@ -46,13 +46,6 @@ color = ; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; }; }; @@ -70,6 +63,13 @@ nvmem-cell-names = "mac-address"; }; +&wmac { + led { + led-sources = <15>; + led-active-low; + }; +}; + &gpio_export { usb-power { gpio-export,name = "usb-power"; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_wifi-camppro-nano-duo.dts b/target/linux/ath79/dts/qca9531_alfa-network_wifi-camppro-nano-duo.dts index e505081f989..7f0dbd4c1c5 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_wifi-camppro-nano-duo.dts +++ b/target/linux/ath79/dts/qca9531_alfa-network_wifi-camppro-nano-duo.dts @@ -32,13 +32,6 @@ color = ; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - - wlan2g { - function = LED_FUNCTION_WLAN_2GHZ; - color = ; - gpios = <&gpio 11 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; }; @@ -51,6 +44,13 @@ compatible = "syscon", "simple-mfd"; }; +&wmac { + led { + led-sources = <11>; + led-active-low; + }; +}; + &gpio_export { usb-power { gpio-export,name = "usb-power"; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts index 2d0ad0af338..4fc6744b40f 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts @@ -23,13 +23,6 @@ pinctrl-names = "default"; - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - lan { function = LED_FUNCTION_LAN; color = ; @@ -149,4 +142,9 @@ nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <0>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts index 5af98bf46b5..576ca4ebb1d 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts @@ -54,13 +54,6 @@ label = "green:rssihigh"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; }; keys { @@ -172,4 +165,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <0>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e355ac-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e355ac-v2.dts index 81c0af19a52..c0990c3e9c7 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e355ac-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e355ac-v2.dts @@ -41,13 +41,6 @@ gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; - wlan2g { - color = ; - function = "LED_FUNCTION_WLAN_2GHZ"; - gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { color = ; function = "LED_FUNCTION_WLAN_5GHZ"; @@ -158,4 +151,8 @@ nvmem-cells = <&cal_art_1000>, <&macaddr_art_0 2>; nvmem-cell-names = "calibration", "mac-address"; + + led { + led-sources = <0>; + }; }; diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts index 2cf35b08201..26fbab09385 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts @@ -41,13 +41,6 @@ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - rssi0 { label = "blue:rssi0"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; @@ -150,6 +143,11 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <0>; + led-active-low; + }; }; &pinmux { diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts index a467e5e823c..99a78b863f7 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts @@ -35,13 +35,6 @@ color = ; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - - wlan { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; }; keys { @@ -148,4 +141,9 @@ nvmem-cells = <&macaddr_art_0 3>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <12>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts index 802d90b752f..f9836afbbc4 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts @@ -47,12 +47,6 @@ default-state = "on"; }; - wlan2g { - label = "white:wlan2g"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "white:wlan5g"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; @@ -166,4 +160,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <14>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts index 6d1674caf32..2aa5bbd295d 100644 --- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts +++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts @@ -33,12 +33,6 @@ default-state = "on"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; @@ -155,4 +149,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <4>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-16m.dts b/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-16m.dts index 4be24986df8..38bd6f895ed 100644 --- a/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-16m.dts +++ b/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-16m.dts @@ -17,12 +17,6 @@ }; &leds { - wlan2g { - label = "orange:wlan2g"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - control1 { label = "green:control"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -46,3 +40,10 @@ reg = <0x070000 0xf90000>; }; }; + +&wmac { + led { + led-sources = <4>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-8m.dts b/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-8m.dts index 826c46b2a18..e303b179a39 100644 --- a/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-8m.dts +++ b/target/linux/ath79/dts/qca9531_qxwlan_e600gac-v2-8m.dts @@ -17,12 +17,6 @@ }; &leds { - wlan2g { - label = "orange:wlan2g"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - control1 { label = "green:control"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -46,3 +40,10 @@ reg = <0x070000 0x790000>; }; }; + +&wmac { + led { + led-sources = <4>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts index 203a192f16f..540eda5a939 100644 --- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts +++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts @@ -49,12 +49,6 @@ color = ; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; - - wlan2g { - label = "red:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; }; @@ -149,4 +143,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts index ad19bab4e2e..d29a82e9a46 100644 --- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts +++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts @@ -42,12 +42,6 @@ function = LED_FUNCTION_POWER; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; - - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; virtual_flash { @@ -207,4 +201,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9550_dell_apl26-0ae.dts b/target/linux/ath79/dts/qca9550_dell_apl26-0ae.dts index 044de5add32..35aa2748333 100644 --- a/target/linux/ath79/dts/qca9550_dell_apl26-0ae.dts +++ b/target/linux/ath79/dts/qca9550_dell_apl26-0ae.dts @@ -36,10 +36,6 @@ gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - led-wlan2g { - gpios = <&gpio 1 GPIO_ACTIVE_LOW>; - }; - led-wlan5g { gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; @@ -58,6 +54,13 @@ }; }; +&wmac { + led { + led-sources = <1>; + led-active-low; + }; +}; + &spi { flash@0 { broken-flash-reset; diff --git a/target/linux/ath79/dts/qca9550_dell_apl27-0b1.dts b/target/linux/ath79/dts/qca9550_dell_apl27-0b1.dts index 28d78f29d21..f1d81db75d7 100644 --- a/target/linux/ath79/dts/qca9550_dell_apl27-0b1.dts +++ b/target/linux/ath79/dts/qca9550_dell_apl27-0b1.dts @@ -29,10 +29,6 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; - led-wlan2g { - gpios = <&gpio 21 GPIO_ACTIVE_LOW>; - }; - led-wlan5g { gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; @@ -63,6 +59,13 @@ }; }; +&wmac { + led { + led-sources = <21>; + led-active-low; + }; +}; + &spi { flash@0 { partitions { diff --git a/target/linux/ath79/dts/qca9550_dell_apl2x.dtsi b/target/linux/ath79/dts/qca9550_dell_apl2x.dtsi index e35a6616fa5..04334bb09c5 100644 --- a/target/linux/ath79/dts/qca9550_dell_apl2x.dtsi +++ b/target/linux/ath79/dts/qca9550_dell_apl2x.dtsi @@ -52,12 +52,6 @@ function-enumerator = <2>; }; - led-wlan2g { - color = ; - function = LED_FUNCTION_WLAN_2GHZ; - linux,default-trigger = "phy1tpt"; - }; - led-wlan5g { color = ; function = LED_FUNCTION_WLAN_5GHZ; diff --git a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts index 46b36400736..83767a352a5 100644 --- a/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts +++ b/target/linux/ath79/dts/qca9557_araknis_an-500-ap-i-ac.dts @@ -37,12 +37,6 @@ default-state = "off"; }; - wifi2g { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "blue:wifi5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -112,6 +106,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts index 6fe518cbabe..7c4f640cb60 100644 --- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts +++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts @@ -39,12 +39,6 @@ default-state = "on"; }; - wifi2g { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "green:wifi5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -114,6 +108,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &ath10k_0 { diff --git a/target/linux/ath79/dts/qca9557_engenius_esr1200.dts b/target/linux/ath79/dts/qca9557_engenius_esr1200.dts index 5faf3277fab..d1872fceeb4 100644 --- a/target/linux/ath79/dts/qca9557_engenius_esr1200.dts +++ b/target/linux/ath79/dts/qca9557_engenius_esr1200.dts @@ -25,12 +25,6 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -82,6 +76,11 @@ &wmac { nvmem-cells = <&calibration_art_1000>, <&macaddr_uboot_eth 1>; nvmem-cell-names = "calibration", "mac-address"; + + led { + led-sources = <13>; + led-active-low; + }; }; &wifi0 { diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts index c5582a45640..96b7b69de68 100644 --- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts +++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts @@ -39,12 +39,6 @@ trigger-sources = <&hub_port1>; }; - wifi2g { - label = "green:wifi2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "green:wifi5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; @@ -149,3 +143,10 @@ nvmem-cell-names = "calibration", "mac-address"; }; }; + +&wmac { + led { + led-sources = <19>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts index bb0f89c3932..63690042b6f 100644 --- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts +++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts @@ -39,12 +39,6 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -114,6 +108,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts index fb2187be1f0..1d7e5339309 100644 --- a/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts +++ b/target/linux/ath79/dts/qca9558_araknis_an-700-ap-i-ac.dts @@ -37,12 +37,6 @@ default-state = "off"; }; - wifi2g { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "blue:wifi5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -112,6 +106,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts index a81b4d96a0d..9da9ec6c7ec 100644 --- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts +++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts @@ -40,12 +40,6 @@ gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 2 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "red:wlan5g"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; @@ -157,4 +151,8 @@ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <2>; + }; }; diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi index 4143ca92702..096c4e56778 100644 --- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi +++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi @@ -32,12 +32,6 @@ gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; - wlan2g { - label = "blue:wlan2"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; @@ -110,6 +104,11 @@ &wmac { status = "okay"; + + led { + led-sources = <13>; + led-active-low; + }; }; // This node is required for the Ethernet ports to work correctly. diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts index 6f23fbec464..a67c53ba5e1 100644 --- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts +++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts @@ -30,12 +30,6 @@ color = ; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; - - wifi2g { - label = "green:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; keys { @@ -119,6 +113,13 @@ }; }; +&wmac { + led { + led-sources = <13>; + led-active-low; + }; +}; + &art { nvmem-layout { compatible = "fixed-layout"; diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts index 7b1ccf410d2..746296b7909 100644 --- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts +++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts @@ -40,12 +40,6 @@ linux,default-trigger = "usbport"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - internet { label = "blue:internet"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; @@ -225,4 +219,9 @@ nvmem-cells = <&macaddr_art_c>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts index ea43eb0e675..073c8070668 100644 --- a/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts +++ b/target/linux/ath79/dts/qca9558_engenius_eap1750h.dts @@ -39,12 +39,6 @@ default-state = "on"; }; - wifi2g { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "green:wifi5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -114,6 +108,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &ath10k_0 { diff --git a/target/linux/ath79/dts/qca9558_engenius_ens1750.dts b/target/linux/ath79/dts/qca9558_engenius_ens1750.dts index 45215d31b57..19b3e23f496 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ens1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ens1750.dts @@ -31,13 +31,6 @@ leds { compatible = "gpio-leds"; - wifi2g { - color = ; - function = LED_FUNCTION_WLAN_2GHZ; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - led_wifi5g: wifi5g { color = ; function = LED_FUNCTION_WLAN_5GHZ; @@ -46,3 +39,10 @@ }; }; }; + +&wmac { + led { + led-sources = <14>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts index 560436b0df9..aa46d33eadf 100644 --- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts +++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts @@ -25,12 +25,6 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -82,6 +76,11 @@ &wmac { nvmem-cells = <&calibration_art_1000>, <&macaddr_uboot_eth 1>; nvmem-cell-names = "calibration", "mac-address"; + + led { + led-sources = <13>; + led-active-low; + }; }; &wifi0 { diff --git a/target/linux/ath79/dts/qca9558_engenius_esr1750.dts b/target/linux/ath79/dts/qca9558_engenius_esr1750.dts index 52075d24813..5324cfc685f 100644 --- a/target/linux/ath79/dts/qca9558_engenius_esr1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_esr1750.dts @@ -25,12 +25,6 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; @@ -82,6 +76,11 @@ &wmac { nvmem-cells = <&calibration_art_1000>, <&macaddr_uboot_eth 1>; nvmem-cell-names = "calibration", "mac-address"; + + led { + led-sources = <13>; + led-active-low; + }; }; &wifi0 { diff --git a/target/linux/ath79/dts/qca9558_engenius_esr900.dts b/target/linux/ath79/dts/qca9558_engenius_esr900.dts index 9ceacb0199b..0ca2057ac2f 100644 --- a/target/linux/ath79/dts/qca9558_engenius_esr900.dts +++ b/target/linux/ath79/dts/qca9558_engenius_esr900.dts @@ -25,16 +25,10 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; + linux,default-trigger = "phy1tpt"; }; wps_amber { @@ -82,6 +76,11 @@ &wmac { nvmem-cells = <&calibration_art_1000>, <&macaddr_uboot_eth 0>; nvmem-cell-names = "calibration", "mac-address"; + + led { + led-sources = <13>; + led-active-low; + }; }; &wifi0 { diff --git a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts index 01a3804fcb2..26b577435d0 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ews660ap.dts @@ -31,13 +31,6 @@ leds { compatible = "gpio-leds"; - wifi2g { - color = ; - function = LED_FUNCTION_WLAN_2GHZ; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - led_wifi5g: wifi5g { color = ; function = LED_FUNCTION_WLAN_5GHZ; @@ -46,3 +39,10 @@ }; }; }; + +&wmac { + led { + led-sources = <14>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index 1341593117c..cca60e69874 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -28,12 +28,6 @@ default-state = "on"; }; - wifi2 { - label = "yellow:wlan2"; - gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5 { label = "red:wlan58"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; @@ -151,6 +145,11 @@ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <23>; + led-active-low; + }; }; &mdio0 { diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts index 5cdf22ac7bc..7c50d83e59c 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts @@ -12,12 +12,6 @@ leds { compatible = "gpio-leds"; - wifi2 { - label = "green:wlan2g"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5 { label = "green:wlan5g"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; @@ -124,6 +118,11 @@ nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <14>; + led-active-low; + }; }; &mdio0 { diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi index 48b8fe81902..8553ea5c6f6 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi +++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi @@ -38,11 +38,6 @@ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - led_wifi2g: wifi2g { - label = "blue:wifi2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - status_green { function = LED_FUNCTION_STATUS; color = ; @@ -184,6 +179,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr1750-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr1750-v1.dts index 11eb6dfb557..2cfca5eb7be 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr1750-v1.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr1750-v1.dts @@ -7,10 +7,6 @@ model = "OpenMesh MR1750 v1"; }; -&led_wifi2g { - linux,default-trigger = "phy1tpt"; -}; - &led_wifi5g { linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr1750-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr1750-v2.dts index 0271db08021..c90e40644b4 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr1750-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr1750-v2.dts @@ -7,10 +7,6 @@ model = "OpenMesh MR1750 v2"; }; -&led_wifi2g { - linux,default-trigger = "phy1tpt"; -}; - &led_wifi5g { linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts index e10e364219d..cedf3e18a82 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts @@ -7,10 +7,6 @@ model = "OpenMesh MR900 v1"; }; -&led_wifi2g { - linux,default-trigger = "phy0tpt"; -}; - &led_wifi5g { linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts index 3198ad2aa90..19d52125552 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts @@ -7,10 +7,6 @@ model = "OpenMesh MR900 v2"; }; -&led_wifi2g { - linux,default-trigger = "phy0tpt"; -}; - &led_wifi5g { linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi index 7c84f3e21df..6ccc35836c1 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi @@ -37,12 +37,6 @@ linux,default-trigger = "usbport"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - qss { label = "green:qss"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; @@ -203,4 +197,9 @@ &wmac { status = "okay"; + + led { + led-sources = <12>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi index ce203807a62..52ba3adf42a 100644 --- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi @@ -25,12 +25,6 @@ gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; @@ -223,4 +217,9 @@ nvmem-cells = <&macaddr_info_8 (-1)>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts index 4c6960ed1e1..b1bc4ebe0d6 100644 --- a/target/linux/ath79/dts/qca9558_watchguard_ap300.dts +++ b/target/linux/ath79/dts/qca9558_watchguard_ap300.dts @@ -48,12 +48,6 @@ gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - wifi_amber { - label = "amber:wifi"; - gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi_green { label = "green:wifi"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; @@ -138,6 +132,11 @@ nvmem-cells = <&macaddr_art_0 1>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <23>; + led-active-low; + }; }; &pcie0 { diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 8dec4257192..6bb4e98cd93 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -44,12 +44,6 @@ trigger-sources = <&hub_port0>; }; - wifi2g { - label = "white:wifi2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "white:wifi5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; @@ -199,3 +193,10 @@ qcom,ath10k-calibration-variant = "ZyXEL-NBG6716"; }; }; + +&wmac { + led { + led-sources = <19>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca955x_elecom_wab.dtsi b/target/linux/ath79/dts/qca955x_elecom_wab.dtsi index 3d16d4aa705..331ccdfd92f 100644 --- a/target/linux/ath79/dts/qca955x_elecom_wab.dtsi +++ b/target/linux/ath79/dts/qca955x_elecom_wab.dtsi @@ -16,14 +16,6 @@ leds { compatible = "gpio-leds"; - led-0 { - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - color = ; - function = LED_FUNCTION_WLAN; - function-enumerator = <24>; - linux,default-trigger = "phy1tpt"; - }; - led_status: led-1 { gpios = <&gpio 14 GPIO_ACTIVE_LOW>; color = ; @@ -244,4 +236,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <13>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi index b3fdc03de47..93bc1bc2c63 100644 --- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi +++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi @@ -40,12 +40,6 @@ default-state = "on"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; @@ -82,4 +76,9 @@ &wmac { status = "okay"; + + led { + led-sources = <17>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts index c0f563bae6d..963eae06a04 100644 --- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts +++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts @@ -32,12 +32,6 @@ color = ; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy1tpt"; - }; }; keys { @@ -166,4 +160,8 @@ nvmem-cells = <&macaddr_art_0 10>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <16>; + }; }; diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts index cf447d782e7..6a82deb80a7 100644 --- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts +++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts @@ -17,12 +17,6 @@ default-state = "on"; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; @@ -89,4 +83,8 @@ &wmac { nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <7>; + }; }; diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi index 3244b499c44..00e08dac7c5 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi @@ -48,12 +48,6 @@ default-state = "keep"; }; - led_wlan2g: wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - led_wlan5g: wlan5g { label = "green:wlan5g"; gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; @@ -203,4 +197,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <19>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi index 5f1ef04f0bb..2ed1423b6ff 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi +++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi @@ -36,12 +36,6 @@ default-state = "keep"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 20 GPIO_ACTIVE_HIGH>; @@ -200,4 +194,9 @@ nvmem-cells = <&calibration_ath9k>; nvmem-cell-names = "calibration"; + + led { + led-sources = <19>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts index d8ecf462017..ad0d0a70f70 100644 --- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts +++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts @@ -60,12 +60,6 @@ gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; - - wlan2g_green { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; keys { @@ -234,4 +228,9 @@ nvmem-cells = <&macaddr_board_data_680 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <19>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi index 757fdfe650a..daafbbcb3c1 100644 --- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi @@ -74,12 +74,6 @@ gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - wlan2g_green { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - wps_green { function = LED_FUNCTION_WPS; color = ; @@ -265,6 +259,11 @@ nvmem-cells = <&macaddr_caldata_0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <19>; + led-active-low; + }; }; &pcie { diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi index 90f6d1a4941..d09cb2ba40d 100644 --- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi +++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi @@ -42,12 +42,6 @@ trigger-sources = <&hub_port0>; linux,default-trigger = "usbport"; }; - - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; }; @@ -174,4 +168,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <19>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts index 4006a0231cc..4afa594f556 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts @@ -26,12 +26,6 @@ default-state = "on"; }; - wifi2g { - label = "green:wifi2g"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "green:wifi5g"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; @@ -208,4 +202,9 @@ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <8>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts index 74ac0f745ac..c097c2c3026 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2-us.dts @@ -27,12 +27,6 @@ default-state = "on"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 9 GPIO_ACTIVE_LOW>; @@ -178,4 +172,9 @@ &wmac { nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <14>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts index 36281f4caa1..ee056b7126d 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts @@ -27,12 +27,6 @@ default-state = "on"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; @@ -173,4 +167,9 @@ &wmac { nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <15>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi index c1000f52a3b..5155bd3a6b1 100644 --- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi @@ -37,12 +37,6 @@ linux,default-trigger = "phy0tpt"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wan { function = LED_FUNCTION_WAN; color = ; @@ -162,4 +156,9 @@ &wmac { status = "okay"; + + led { + led-sources = <14>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts index 1f8ded0c140..f2e8040360f 100644 --- a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts @@ -20,12 +20,6 @@ leds { compatible = "gpio-leds"; - wlan2g { - label = "red:wlan2g"; - gpios = <&gpio 1 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - led_power: power { function = LED_FUNCTION_POWER; color = ; @@ -166,4 +160,9 @@ nvmem-cells = <&macaddr_config_8 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <1>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_deco-s4-v2.dts b/target/linux/ath79/dts/qca9563_tplink_deco-s4-v2.dts index 69d97f6e469..d29d3447287 100644 --- a/target/linux/ath79/dts/qca9563_tplink_deco-s4-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_deco-s4-v2.dts @@ -20,12 +20,6 @@ leds { compatible = "gpio-leds"; - wlan2g { - label = "red:wlan2g"; - gpios = <&gpio 1 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - led_power: power { function = LED_FUNCTION_POWER; color = ; @@ -151,4 +145,9 @@ nvmem-cells = <&cal_art_1000>; nvmem-cell-names = "calibration"; + + led { + led-sources = <1>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi index 2e9ef99cd0d..0df9647c50c 100644 --- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi @@ -24,12 +24,6 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; }; - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "blue:wlan5g"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; @@ -136,4 +130,9 @@ &wmac { status = "okay"; + + led { + led-sources = <14>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts index 3351c993eb5..90894491bf4 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wa1201-v2.dts @@ -29,12 +29,6 @@ default-state = "on"; }; - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wlan5g { label = "green:wlan5g"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; @@ -111,6 +105,11 @@ nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>; nvmem-cell-names = "mac-address", "calibration"; + + led { + led-sources = <15>; + led-active-low; + }; }; &spi { diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi index 81fb6ce097f..6ee3c471906 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi @@ -61,12 +61,6 @@ gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; - wifi2g { - label = "green:wifi2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - wifi5g { label = "green:wifi5g"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; @@ -129,4 +123,9 @@ &wmac { status = "okay"; + + led { + led-sources = <19>; + led-active-low; + }; }; diff --git a/target/linux/ath79/dts/qca9563_yuncore_a782.dts b/target/linux/ath79/dts/qca9563_yuncore_a782.dts index 5a84195bfbf..4073aac8728 100644 --- a/target/linux/ath79/dts/qca9563_yuncore_a782.dts +++ b/target/linux/ath79/dts/qca9563_yuncore_a782.dts @@ -21,11 +21,12 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - - wlan2g { - label = "green:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; + }; +}; + +&wmac { + led { + led-sources = <19>; + led-active-low; }; }; diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd3200.dts b/target/linux/ath79/dts/qca9563_yuncore_xd3200.dts index fa82a6914b6..cf51a1149b8 100644 --- a/target/linux/ath79/dts/qca9563_yuncore_xd3200.dts +++ b/target/linux/ath79/dts/qca9563_yuncore_xd3200.dts @@ -22,12 +22,6 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; }; @@ -37,3 +31,10 @@ nvmem-cell-names = "calibration"; }; }; + +&wmac { + led { + led-sources = <19>; + led-active-low; + }; +}; diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts index 05032fc955a..f937a90f31d 100644 --- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts +++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts @@ -21,11 +21,12 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; default-state = "keep"; }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; + }; +}; + +&wmac { + led { + led-sources = <19>; + led-active-low; }; }; diff --git a/target/linux/ath79/dts/qca9563_zte_mf286.dtsi b/target/linux/ath79/dts/qca9563_zte_mf286.dtsi index df9a9d3f698..58687226c72 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf286.dtsi +++ b/target/linux/ath79/dts/qca9563_zte_mf286.dtsi @@ -7,13 +7,6 @@ leds { pinctrl-names = "default"; pinctrl-0 = <&enable_wlan_led_gpio>; - - led-1 { - function = LED_FUNCTION_WLAN; - color = ; - gpios = <&gpio 19 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; }; keys { @@ -31,3 +24,10 @@ pinctrl-single,bits = <0x10 0x0 0xff000000>; }; }; + +&wmac { + led { + led-sources = <19>; + led-active-low; + }; +};