ath79: convert phy1tpt to led-sources

Makes it a lot clearer what phy1tpt is, especially since it differs
between ath10k and ath9k.

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/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
index 3ec3a4fe6193b3ab2859a964b9a42384d4c4f24b..bf776b53b1972b6ca7638e0bed357f23ebcdbee5 100644 (file)
--- 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 800d32611d54c6f989ba04ce770075449285b296..1d64c7085971bab95cff3945d398ccd0226bc4d5 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
+++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts
@@ -63,12 +63,6 @@
                        color = <LED_COLOR_ID_ORANGE>;
                        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 ce69422c81b644193e3ddf5b8941426bd6c72d52..90ed01ceec7fa7f7d8ecfeb3cbbe3f4c6a0ec403 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       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 fc2aa19324fbf8e9c47a250dd3186f53cabf1ee6..b0d0647120199e65526eb29b044c4d0940517e54 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
-                       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 698f028df8157ba2cafca38601f26b13fdb1f13b..c1e95242ec744d42be2dccf94b34a49971bb382e 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       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 e505081f989215e8cd5ee3dfbcd83fea690243b8..7f0dbd4c1c503b60c4a79bc08f80c10eeada0d98 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
-
-               wlan2g {
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       color = <LED_COLOR_ID_BLUE>;
-                       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 2d0ad0af338f9e744454552ce47623f4d2eb3a2b..4fc6744b40feadd042f58b5d6b481b0d6822f3e5 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -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 5af98bf46b558cfadd6040c624c9b90dae8c0a24..576ca4ebb1d6472fac7d3273dce6880afe1c7105 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       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 81c0af19a52caaafb67bfd0ed5aab42eae076749..c0990c3e9c7ecb56a5900a1ca5bb94ffab8e61f4 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
-                       function = "LED_FUNCTION_WLAN_2GHZ";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                wlan5g {
                        color = <LED_COLOR_ID_RED>;
                        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 2cf35b0820190d01d1be38cd2f522d356759d649..26fbab093853f0c3a65b06754d896d3c07f3b9f0 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
-                       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 a467e5e823c73e2c35acf182d2372e27c52b79f5..99a78b863f76bdb7a3ee037311837fc04c850fa0 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       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 802d90b752fb0ba46cd89da5195d47406fd43cb1..f9836afbbc4b5c9a06e709770f19067de09e0ed4 100644 (file)
--- 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 6d1674caf32073a583d983403bc13a4e40c4c609..2aa5bbd295dc97a0a0a2a9fea6ddaafa97e9912a 100644 (file)
--- 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 4be24986df87debeefa174a9df85ccf4fc26a515..38bd6f895ed95d611820af1ff76759c792c1a55f 100644 (file)
--- 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 826c46b2a18285a03ebe2696568bf46ad9553a1c..e303b179a3925265d9cc2eb1114396a98d2302f5 100644 (file)
--- 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 203a192f16fbe095b0a3d4d9c4b737122bda6633..540eda5a939ba28c713a8a76a6cdb012ccb4cb2d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -49,12 +49,6 @@
                        color = <LED_COLOR_ID_GREEN>;
                        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 ad19bab4e2e75bdfd84da6a1d508ed2e43fcdaee..d29a82e9a46fb53672c181ff9cde2683e869c459 100644 (file)
--- 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 044de5add3209dec74277e84c08fa2438a6c5a84..35aa2748333b1b00d1fa62c870810ecfcd44a441 100644 (file)
--- 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 28d78f29d216d2a17aa367276876d34c840fc1d4..f1d81db75d7700d1eea09f7f91cceedf83f205e1 100644 (file)
--- 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 e35a6616fa53e50669114be1590cbd12b6d39ad8..04334bb09c507883d3534f3626478506d8e54445 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                led-wlan5g {
                        color = <LED_COLOR_ID_GREEN>;
                        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 46b364007368ce1c880e3ab5d91ca6366b9f15ee..83767a352a53a44419f80ac42b80b688651373e8 100644 (file)
--- 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 6fe518cbabe2e13d34141d86f6f733341987af28..7c4f640cb6044950c48983886860b14d0c5573aa 100644 (file)
--- 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 5faf3277fab74bc867975bbbbf0601b275170182..d1872fceeb4a9dd5d103ebd754d7be196d2c83de 100644 (file)
--- 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 c5582a4564004ebd8ef18e9190b5eadc9e1bdf0a..96b7b69de68ba2775528e27037d29f65fd4dd8a4 100644 (file)
--- 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 bb0f89c3932843c832d5901537124ce24b743bdd..63690042b6f7a37f982baa4cad3e771fa08d6e05 100644 (file)
--- 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 fb2187be1f047584d2b4605e8c386b48fe830fab..1d7e53393094584329bf1b81cb074cc771da26da 100644 (file)
--- 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 a81b4d96a0da3a68a321cb622034e30a1363257a..9da9ec6c7ece7f994c5f912a1ad5e28f579715cd 100644 (file)
--- 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 4143ca927025f8540e73f31df8ffd4b2da982ecf..096c4e567789796cc7a3e69d7bb9b8a8677af072 100644 (file)
--- 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 6f23fbec46489c059aaa6966f8fcb644522cff01..a67c53ba5e10354c5dc8e96c94119164b2b22753 100644 (file)
--- 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 = <LED_COLOR_ID_RED>;
                        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 7b1ccf410d2764e2995d801cd06c2b594d216a1b..746296b790991b8a59e6ba3c7ff1c567ca948551 100644 (file)
--- 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 ea43eb0e6754ae9773c7fff66ea592a47897c58b..073c80706681adb46ac1fbb2a93a7028a8128a86 100644 (file)
--- 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 45215d31b57a2009135848aece60c1f1fdd6bf5e..19b3e23f496b6d15afec4f081a1b64216aafd86f 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                led_wifi5g: wifi5g {
                        color = <LED_COLOR_ID_GREEN>;
                        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 560436b0df9b19058d5b46d746ffb9e6941808eb..aa46d33eadf241c7b6afad26ad93a8ca1a040e2a 100644 (file)
--- 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 52075d248133294bc521a11b2bc6d1677800096c..5324cfc685f61d7c807f27d141e4ea15f0b2f877 100644 (file)
--- 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 9ceacb0199b0d3f5bf475edf11a4ed7403d3d7c2..0ca2057ac2f1f977382e1c4a7b0e9ba0c30afd53 100644 (file)
--- 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 01a3804fcb2912f0d7a6b22483588760c6581e79..26b577435d012ecd9a02b1483cac1679a7c49c10 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                led_wifi5g: wifi5g {
                        color = <LED_COLOR_ID_GREEN>;
                        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 1341593117c7353a1a8a528d7eb60a4488b67829..cca60e69874ad72033c186771b24bcd4ff0deb31 100644 (file)
--- 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 5cdf22ac7bce9ffeca674db23f6c9f26e5545ad1..7c50d83e59cb706fb422d752e13c2badf7c311db 100644 (file)
--- 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 48b8fe819021bb33c959e216a530315751b563c4..8553ea5c6f62d753e9a159239fd4b07bea072871 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
@@ -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 11eb6dfb5579b470d6160de34c3e305ff60703c9..2cfca5eb7be7abf6850d86b3d86565f51d1a73f9 100644 (file)
--- 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 0271db08021c2d5965ac4e9cbd79042f670747ae..c90e40644b481629543d1e158cecfb6ad975012b 100644 (file)
--- 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 e10e364219dcc748769f6f30e57e0cf5d36f3b7d..cedf3e18a8289ba47dd03c41a0e9ae2f357fa27c 100644 (file)
--- 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 3198ad2aa90b93c93e3b7a23eaf0ce359adc7866..19d52125552c1e6424c26f379810aba1217452d0 100644 (file)
--- 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 7c84f3e21df872627a3acabe804f93ae55699d18..6ccc35836c1b60823651a6cbdbb5da442f2d3efc 100644 (file)
--- 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 ce203807a62e913f52852748ba5f144938c4b501..52ba3adf42a77048c16abb499037c7f76f40a0b8 100644 (file)
--- 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 4c6960ed1e1c485bb055e2dc7078927c21bec257..b1bc4ebe0d62f7992a03f81dc3290d42a0c777db 100644 (file)
--- 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 8dec4257192d8756a1c8fff114fe72c7936eeab2..6bb4e98cd93b628627fe22ca485a5e9042161fa8 100644 (file)
--- 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 3d16d4aa70574e25d80a034d4af9d9f080bfc12a..331ccdfd92f2d2b6978752adf34c398e9482c23d 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN;
-                       function-enumerator = <24>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                led_status: led-1 {
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        color = <LED_COLOR_ID_RED>;
@@ -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 b3fdc03de47e0e693dc937824b701f73094ce884..93bc1bc2c6337ac06b10b5dd8d1b87389654bf33 100644 (file)
--- 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 c0f563bae6df405b3c20fb7063b948da60075c21..963eae06a047d4b6b914f4164b1a0663f1553593 100644 (file)
--- 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 = <LED_COLOR_ID_RED>;
                        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 cf447d782e792cab2c344f3e4cf4d1e74e52ebcc..6a82deb80a7116c7809079b32fb9d5fcefc0f58b 100644 (file)
--- 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 3244b499c44071a19b5c24bbdea63f8f1a4c08e1..00e08dac7c5b545ce709e81aad4cccb77b80a3f2 100644 (file)
--- 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 5f1ef04f0bb4287b6c5531b4295dbf2e87cdcdfa..2ed1423b6ff1e63bba39914b1907076bdb5a54ba 100644 (file)
--- 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 d8ecf462017fa412b0660516e43a7a6449fae5dc..ad0d0a70f708ae57203e2f6e3f6b3d34d8596d3b 100644 (file)
--- 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 757fdfe650ae21573220bb605b9bb00ec00ed275..daafbbcb3c18909fd15c2196b6f723fa1b5e402f 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
@@ -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 90f6d1a494113f6addabd9f4e741141560d9cb82..d09cb2ba40db4cf1b141621d32e5c7ab4df1b30c 100644 (file)
--- 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 4006a0231ccbda9856bb271d6d4e229bb82605b6..4afa594f55685d451ca39b9e55b36d7f78f845db 100644 (file)
--- 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 74ac0f745ac1546d4564902a0c744784e1b7f3ed..c097c2c3026f3dbac3dc0aa891ec813e363c48f4 100644 (file)
--- 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 36281f4caa137e607ab71820b2466d7d7fb80209..ee056b7126dbe4dbb5a46d379a8c77d4bfc370c0 100644 (file)
--- 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 c1000f52a3bdf288bd13759e9b19d948307f14a5..5155bd3a6b1ab7b4a71cb34e29d30be4d01cb95d 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
@@ -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 1f8ded0c140cd90a2a9bd41931d5060bd16dfce9..f2e8040360fcd1ddbaa1d96f34c0d7c7e2f958cf 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
@@ -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 69d97f6e4695f2d794477fedc1ccedd5504a8ce0..d29d3447287b18c493537e0faa684a9c6502743b 100644 (file)
--- 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 = <LED_COLOR_ID_GREEN>;
@@ -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 2e9ef99cd0d9f723737519c31cbf4ce147d4cad5..0df9647c50cd77d5458f71fbe7a896e72ebdbf0c 100644 (file)
--- 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 3351c993eb534c153309702d8c2528164729ac05..90894491bf4345295fd5099b9b5a3e9d66aa0ac8 100644 (file)
--- 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 81fb6ce097fd1cdc8c28912292d08ea8b708a648..6ee3c471906f9dd4c9d0dd3fc09c28444f3a7d92 100644 (file)
--- 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 5a84195bfbfcf030f0af97f11ebf861a90299515..4073aac87289c2c78c6706a2a7c0f721b84551eb 100644 (file)
--- 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 fa82a6914b6d5fe59db1f1f470efe293a9a976c4..cf51a1149b8e6018f0b947bac7a4e6dfec8d11e3 100644 (file)
--- 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 05032fc955a256b7b15cc1340d3aeb1b4e85a0a0..f937a90f31ddc1d67c0f25b82c9d33c280b9cb39 100644 (file)
--- 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 df9a9d3f6989f9585c9b73af8a1c36111a3f7dc8..58687226c72e57e234732e1f24a566ec8154b97c 100644 (file)
--- 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 = <LED_COLOR_ID_BLUE>;
-                       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;
+       };
+};