ath79: mr600-v1: use led-sources for ath9k

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.

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/ar9344_openmesh_mr600-v1.dts b/target/linux/ath79/dts/ar9344_openmesh_mr600-v1.dts
index f7985629bb2585e4e1897860bff2372ff6542d3a..6fab1575c40ce873884fa79424b19172ed9ce3f1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600-v1.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600-v1.dts
@@ -18,12 +18,6 @@
        leds {
                compatible = "gpio-leds";
 
-               wifi5g_green {
-                       label = "green:wifi5g";
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wps_blue {
                        function = LED_FUNCTION_WPS;
                        color = <LED_COLOR_ID_BLUE>;
@@ -37,14 +31,18 @@
                        default-state = "on";
                };
        };
+};
 
-       leds-ath9k {
-               compatible = "gpio-leds";
+&wmac {
+       led {
+               led-sources = <12>;
+               led-active-low;
+       };
+};
 
-               wifi2g {
-                       label = "blue:wifi2g";
-                       gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
+&ath9k {
+       led {
+               led-sources = <0>;
+               led-active-low;
        };
 };

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index 7661789e2f6156f17bd5213fccdde422f8410a24..c88719d4d8ca8abdbb1399df991ce724b0bdb7ae 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -138,13 +138,10 @@
 &pcie {
        status = "okay";
 
-       ath9k: wifi@0,0 {
+       wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_0 8>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-
-               gpio-controller;
-               #gpio-cells = <2>;
        };
 };