ath79: fix some ath10k LEDs

ath10k loads before ath9k and thus ends up as phy0.

Also use led-sources to avoid some confusion.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19860
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 6e9df069188ee7daf3d33a575a43224e7769e1de..f84f8b084bca127c53ecaebc668adab8a3a10f5a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -50,16 +50,10 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               wlan2g {
-                       label = "green:wlan2g";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wlan5g {
                        label = "green:wlan5g";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
+                       linux,default-trigger = "phy0tpt";
                };
        };
 
@@ -157,4 +151,9 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <15>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 114b053c883bcc048fed76f1b88342b4bc984d18..73c08d290f4fef187dcac70ecb01c110e68f0bf4 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -21,16 +21,10 @@
        leds {
                compatible = "gpio-leds";
 
-               wlan2g {
-                       label = "white:wlan2g";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wlan5g {
                        label = "white:wlan5g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
+                       linux,default-trigger = "phy0tpt";
                };
 
                qss {
@@ -190,6 +184,11 @@
 
        nvmem-cells = <&macaddr_romfile_f100 0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <14>;
+               led-active-low;
+       };
 };
 
 &pcie0 {