ath79: qca955x: 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/qca9557_fortinet_fap-221-c.dts b/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
index 15abfec557fea755c42917816a5bb0248a04c0a2..f8e68a578999d4361ddb95f3d18036af2cb20b15 100644 (file)
--- a/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
+++ b/target/linux/ath79/dts/qca9557_fortinet_fap-221-c.dts
@@ -45,13 +45,6 @@
                        default-state = "on";
                };
 
-               wifi1_green {
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                wifi1_amber {
                        function = LED_FUNCTION_WLAN_2GHZ;
                        color = <LED_COLOR_ID_AMBER>;
@@ -200,6 +193,11 @@
 
        nvmem-cells = <&calibration_wmac>, <&macaddr_uboot_3ff80 1>;
        nvmem-cell-names = "calibration", "mac-address";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/qca9557_ruckus_r500.dts b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
index 2e5734e2883e3a8cbef0da27e1d6f5616f4923ac..a5acb5918c67172241c512ad2693612d5867c39b 100644 (file)
--- a/target/linux/ath79/dts/qca9557_ruckus_r500.dts
+++ b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
@@ -64,13 +64,6 @@
                        linux,default-trigger = "phy1assoc";
                };
 
-               led-5 {
-                       color = <LED_COLOR_ID_YELLOW>;
-                       function = LED_FUNCTION_WLAN_2GHZ;
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                led-6 {
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WLAN_5GHZ;
@@ -279,6 +272,11 @@
 
        nvmem-cells = <&macaddr_board_data_60>, <&cal_board_data_41000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <2>;
+               led-active-low;
+       };
 };
 
 &usb_phy0 {

diff --git a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
index 5a7fa593cec7fc156a42df15a56ba4d1f7a9d3ea..a4d29ced49af7db6abe1d53a858cc39d5f651cb7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
+++ b/target/linux/ath79/dts/qca9558_aruba_ap-115.dts
@@ -48,12 +48,6 @@
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               radio-24-green {
-                       label = "green:radio-24";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                radio-24-amber {
                        label = "amber:radio-24";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
@@ -199,6 +193,11 @@
 
        nvmem-cells = <&macaddr_oemdata_1d 0>, <&cal_oemdata_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };
 
 &mdio0 {

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index becd5cc44b4380de92e18bf791e87326afe45a83..95bb6ba5bb4411cba74642dfbd6bea80009fe7ad 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -53,12 +53,6 @@
                        default-state = "on";
                };
 
-               wlan2g_green {
-                       label = "green:wlan2g";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
                wlan2g_red {
                        label = "red:wlan2g";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
@@ -209,4 +203,9 @@
 
        nvmem-cells = <&macaddr_info_8 0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <16>;
+               led-active-low;
+       };
 };