ath79: 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>

diff --git a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
index e41031d6830dbff9fbb7044baeb9972b02bdd250..b2e25bbf3116db6c055c93aab8a699f665bee195 100644 (file)
--- a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
+++ b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
@@ -174,12 +174,6 @@
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
-               wireless {
-                       label = "green:wireless";
-                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_security: security {
                        label = "amber:security";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
@@ -255,6 +249,11 @@
 
        nvmem-cells = <&cal_art_11000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <6>;
+               led-active-low;
+       };
 };
 
 &uart {

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 3fcc4073fea63036acd95ab0cc77479678265418..953f4212ca15b3e3178f9e447dd01226f829635a 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -48,13 +48,6 @@
                        label = "green:qss";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -141,4 +134,9 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <9>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index e392771ce8425225ea853314f6a92679c482d449..d336f3550a4ef31a922d5b01be9c0f688a7757fa 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -57,13 +57,6 @@
                        label = "green:qss";
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 
        rtl8366rb {
@@ -157,4 +150,9 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <9>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index 3ad058e95973506181f5b975a72aff3417c453ba..bebc2b2296a2c7a41f21d917b7f91005c00bd226 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -53,13 +53,6 @@
                        label = "green:qss";
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -179,4 +172,9 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <9>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
index 8e38c9f5fba43140d85a64a331e3dd5b58e6be75..7e39df97826024af62d04c579f370a35f969ebc3 100644 (file)
--- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
@@ -21,13 +21,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_ORANGE>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                configurable {
                        label = "green:configurable";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
@@ -163,4 +156,8 @@
 
        nvmem-cells = <&macaddr_art_0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
index 1a02a8dec50871dc3a84c4b38fed9575e5a8f65d..632085daf4269ad6cd050d63c08fc114a8309a59 100644 (file)
--- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
+++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
@@ -53,12 +53,6 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               wifi_green {
-                       label = "green:wifi";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wifi_red {
                        label = "red:wifi";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@@ -172,4 +166,9 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <15>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
index b4a4e6894ddd7c1507b4369a76eefef679bb3c46..02f3b1e0ef51095b721c72879d54003d4460e252 100644 (file)
--- a/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
+++ b/target/linux/ath79/dts/ar9330_ziking_cpe46b.dts
@@ -17,13 +17,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                rssi1 {
                        label = "green:rssi1";
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
@@ -120,4 +113,8 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index 6c38f54593ff3e53af513f0e4b950ef9ee3b058b..fe4452cdd19ecc462a1953b44c9b1a95e1e5e5be 100644 (file)
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -17,13 +17,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                eth0 {
                        label = "orange:eth0";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
@@ -147,4 +140,9 @@
 
        nvmem-cells = <&macaddr_art_6>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <0>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index 2d9e17bcf8ac46628a4e259fd43a8b0e3eff95f2..940393034145be876f9d7063c2f74c151c321002 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -45,13 +45,6 @@
                        label = "green:vpn";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -141,4 +134,8 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts
index bb2a42612f80587971d083ebc0e6f6ce14e78b6f..9b7c61768f6aca639514ec9dbc68e18650b80194 100644 (file)
--- a/target/linux/ath79/dts/ar9331_arduino_yun.dts
+++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts
@@ -49,13 +49,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                usb {
                        function = LED_FUNCTION_USB;
                        color = <LED_COLOR_ID_WHITE>;
@@ -205,4 +198,8 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index a887056d732c4425774892efeb471f7ed83097dd..a261a07357541859e6cc0679e6d56467e6352dd2 100644 (file)
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -44,13 +44,6 @@
                        label = "red:eth0";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_RED>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -135,4 +128,9 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <0>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
index be199b5e4fa1a8b223a44c3a26428a69487e5805..663ab26a5723a4ea4c3dcd5e5cdf1bf12f3a20f0 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
+++ b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
@@ -21,13 +21,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_RED>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -71,4 +64,8 @@
 
 &wmac {
        status = "okay";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
index 067d760b04ca2bdc12244909aaf96f707e8bad5a..fec6e250e74deb7a415e7a8f3fce53a8877491df 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
@@ -17,13 +17,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -162,4 +155,8 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <1>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
index f440d63b1636f3efdf3183d5678be42e4d1811cb..f9a2db332ee4340315a930a2b4c7e35c762ce415 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-usb150.dts
@@ -21,13 +21,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_power: power {
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_GREEN>;
@@ -135,4 +128,8 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 551782daa8d550c94df18a9e77108f323bb2200a..e17c00aa876160c60d4637412c2127c25287e0c5 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -21,13 +21,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -184,4 +177,8 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index 592e8596e30953603d600f38dea923b3de061aad..45b77bbd46c50a1cb7129de957c39ee693444543 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -22,13 +22,6 @@
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_disable_pins>;
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_lan: lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -172,4 +165,9 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <26>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index b1b6577ae22889ce034c687c240d24194a3d7353..78c4e191d06b8ecd48d60e1e4ec7394dbd6fbac9 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -77,13 +77,6 @@
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -169,4 +162,8 @@
 
        nvmem-cells = <&macaddr_uboot_1fc00 0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <0>;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index 69dd46f0c7fe36694c31c0f73345b20be2a95777..03d89be0c4b6748542f02c717c8275aa9c0405ed 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -38,13 +38,6 @@
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -58,6 +51,11 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <17>;
+               led-active-low;
+       };
 };
 
 &art {

diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 0e455ab98297b1f5dd8574c0518ba1a9f3775908..d4bf2aa4367d62bd0f410e2ce638d16039caccf9 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -39,13 +39,6 @@
                        default-state = "on";
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_AMBER>;
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                rssilow {
                        label = "red:rssilow";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
@@ -89,6 +82,11 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <18>;
+               led-active-low;
+       };
 };
 
 &art {

diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
index 767570280250bbf1139e75786069e37a8d841aa7..ce19fb5cdb9830df378dceef0bcdd9864822ae76 100644 (file)
--- a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
+++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
@@ -42,12 +42,6 @@
                        default-state = "on";
                };
 
-               wifi_green {
-                       label = "green:wifi";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wifi_red {
                        label = "red:wifi";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
@@ -182,4 +176,9 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index bc75391dc6235fa75f2985ae63b5e946eeb04b86..7bcb29905733bdac04908999df02b31d176d3590 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -48,13 +48,6 @@
                        default-state = "on";
                };
 
-               wlan2g {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wan {
                        function = LED_FUNCTION_WAN;
                        color = <LED_COLOR_ID_BLUE>;
@@ -148,6 +141,11 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi
index 5dff908129a9c5b90d6208ab98c269ecbc03d3f5..7e61f4034b5023f69f2a7f5b91da198e93badc93 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink.dtsi
@@ -24,13 +24,6 @@
                        default-state = "on";
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                qss {
                        label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
@@ -94,4 +87,9 @@
 
 &wmac {
        status = "okay";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
index 08f14f5cc1b6fe925372dbc5802018cce95af1eb..3c8dd7e0bd3f63146162e51c36b17333ae46b277 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
@@ -42,13 +42,6 @@
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_re: re {
                        label = "blue:re";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
@@ -80,3 +73,10 @@
                };
        };
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
index e1ed0c29359687452da1fa8204e5664d5c2113f0..7f4c9d507caebe4e10d8b5a5e79de4a52732d78c 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
@@ -62,13 +62,6 @@
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
-               wlan_green {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wlan_orange {
                        function = LED_FUNCTION_WLAN;
                        color = <LED_COLOR_ID_ORANGE>;
@@ -76,3 +69,10 @@
                };
        };
 };
+
+&wmac {
+       led {
+               led-sources = <2>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
index 696e8f6391ebd29cf5062e83ba11a4519bc1e113..02565f63443f95157eabc9054cb04dfcf4f841a7 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
@@ -35,13 +35,6 @@
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                qss {
                        label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
@@ -53,3 +46,10 @@
                };
        };
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9342_ubnt_litebeam-m5-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_litebeam-m5-xw.dts
index bc01bdffb59c764baae05b290b85033a407f9d08..4f9a0f670b38047b98be85fca18ade7302312d94 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_litebeam-m5-xw.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_litebeam-m5-xw.dts
@@ -27,13 +27,6 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               led-wlan {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN;
-                       linux,default-trigger = "phy0tpt";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-               };
-
                led_status: led-power {
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
@@ -57,3 +50,10 @@
 
        phy-handle = <&phy1>;
 };
+
+&wmac {
+       led {
+               led-sources = <14>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index 94543cd25574fd8999e252a983a6645d5705e15d..0cbddc529d97b9e4aa2956f9d6dab9721bb958d8 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -23,12 +23,6 @@
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
-
-               wifi5g {
-                       label = "green:wifi5g";
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -47,6 +41,11 @@
 &wmac {
        nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <12>;
+               led-active-low;
+       };
 };
 
 &art {

diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index 1b75d887f298aec722041214c176bb665ce45450..acfcafaa652100784b12ac7e376318e16fcc2832 100644 (file)
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -17,12 +17,6 @@
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
-
-               wifi5g {
-                       label = "blue:wifi5g";
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
@@ -41,6 +35,11 @@
 &wmac {
        nvmem-cells = <&macaddr_art_0 (-1)>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <12>;
+               led-active-low;
+       };
 };
 
 &art {

diff --git a/target/linux/ath79/dts/ar9344_fortinet_fap-221-b.dts b/target/linux/ath79/dts/ar9344_fortinet_fap-221-b.dts
index 4474b1be8136d8a33ee9bb16233f72efaec033f5..1e190cc6c6a937fc6fe56f900150c2f1ca66c485 100644 (file)
--- a/target/linux/ath79/dts/ar9344_fortinet_fap-221-b.dts
+++ b/target/linux/ath79/dts/ar9344_fortinet_fap-221-b.dts
@@ -43,12 +43,6 @@
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
-
-               wifi5g {
-                       label = "green:wifi5g";
-                       gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 
        virtual_flash {
@@ -73,6 +67,11 @@
 
        nvmem-cells = <&calibration_wmac>, <&macaddr_uboot_3ff80 1>;
        nvmem-cell-names = "calibration", "mac-address";
+
+       led {
+               led-sources = <18>;
+               led-active-low;
+       };
 };
 
 &art {

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
index de7acdbca9affcad1a28deac2c8d36b291561131..e25185b3470e3e2aa1bbe09790e59bf528dede56 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
@@ -52,12 +52,6 @@
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
-               wifi5g_green {
-                       label = "green:wifi5g";
-                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wifi5g_yellow {
                        label = "yellow:wifi5g";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
@@ -77,3 +71,10 @@
 &wdt {
        status = "disabled";
 };
+
+&wmac {
+       led {
+               led-sources = <21>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
index 24ce6eead67192f2054bc9a4c982bf9f8c1af2b4..10da578569915281327fad3b468c97bba230cc85 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
@@ -57,12 +57,6 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               wifi_green {
-                       label = "green:wifi";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wifi_yellow {
                        label = "yellow:wifi";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
@@ -227,6 +221,11 @@
 
        nvmem-cells = <&macaddr_art_0 2>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <16>;
+               led-active-low;
+       };
 };
 
 &pcie {

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
index 7b08d6a5e60b2bb42709abc66289b893f9303cb5..05231860a0c81b805eea78702b33d0fe946ba171 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
@@ -57,12 +57,6 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               wifi_green {
-                       label = "green:wifi";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wifi_yellow {
                        label = "yellow:wifi";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
@@ -187,4 +181,9 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <16>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe605-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe605-v1.dts
index 1b762896a14d790fd8e5b96e8dee02feae72aaf0..100e10e79bed657b8e79384d18878324654318ef 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe605-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe605-v1.dts
@@ -22,15 +22,16 @@
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
-
-               wlan5g {
-                       label = "green:wlan5g";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
index c44ad29ccf907a63d23cf28d07c52e17d960622f..eb929abba8e243a64414eecf92dc45adc5ec6b71 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
@@ -22,15 +22,16 @@
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
-
-               wlan5g {
-                       label = "green:wlan5g";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
index 7228ca9f49c860775f4d86d70fb7c3f5defcd149..cd3d1a09e71e44cd3570cd6afe0f0a327f933358 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
@@ -22,15 +22,16 @@
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
-
-               wlan5g {
-                       label = "green:wlan5g";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
index 4c25d61c5aeacfa5cbb902870c777e5240121c33..9f15bffbc7548a657563b06df11b20ca81bce41b 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
@@ -16,12 +16,6 @@
        leds: leds {
                compatible = "gpio-leds";
 
-               wlan2g {
-                       label = "green:wlan2g";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_system: system {
                        label = "green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
@@ -115,3 +109,10 @@
                };
        };
 };
+
+&wmac {
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
+};