ath79: convert phy0tpt 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/21004
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
index 52ef729512aa2808661bd48dbb35c77943308e4c..a38cbbacd9388470ac9e1fc7509bf8cce6765e83 100644 (file)
--- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
+++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
@@ -157,7 +157,7 @@
 
                led {
                        led-sources = <1>;
-                       led-actice-low;
+                       led-active-low;
                };
        };
 };

diff --git a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
index 9123ae34b2396f0f5d1db2600f34f8bb37fe6e82..5932aacb9b712e14f093ec4d5c67efc4bd2cbe31 100644 (file)
--- a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
@@ -26,13 +26,6 @@
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                lan {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
@@ -79,3 +72,10 @@
                line-name = "phy-reset";
        };
 };
+
+&wmac {
+       led {
+               led-sources = <15>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
index 2d490dcf4809a1737b297757f4fc99cf7ae381ae..dc65700d6ede3420a91d9b798f02486055829f9c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
@@ -37,20 +37,13 @@
        leds {
                compatible = "gpio-leds";
 
-               led-0 {
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_WLAN;
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
-               led_power: led-1 {
+               led_power: led-0 {
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_POWER;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
-               led-2 {
+               led-1 {
                        color = <LED_COLOR_ID_GREEN>;
                        function = LED_FUNCTION_WPS;
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
@@ -173,4 +166,9 @@
 
        nvmem-cells = <&cal_art_1000>, <&macaddr_mfcdata_51 0>;
        nvmem-cell-names = "calibration", "mac-address";
+
+       led {
+               led-sources = <13>;
+               led-active-low;
+       };
 };

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index 0f07613d1fc96b6d31729fbcf09c64568bd574ac..522f9f956fe892574ea6a4bced22de4252190eac 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -23,12 +23,6 @@
                        label = "red:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
-
-               wifi_2g {
-                       label = "red:wifi2g";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 
        keys {
@@ -137,6 +131,11 @@
 
        nvmem-cells = <&cal_art_1000>;
        nvmem-cell-names = "calibration";
+
+       led {
+               led-sources = <19>;
+               led-active-low;
+       };
 };
 
 &usb_phy0 {

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
index 1cf74619260ed0fca27fd497f24a6af57646e4a5..a1733a4f08c9727bcbba68b71ad354a442721e09 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
@@ -41,16 +41,16 @@
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
-
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
        };
 };
 
 &eth1 {
        compatible = "syscon", "simple-mfd";
 };
+
+&wmac {
+       led {
+               led-sources = <8>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
index 7780e0172c3370986d048bb52df8a891fd0f3641..ac1ebd375dd12fa284e2d9607336f57b5ec30aab 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -26,13 +26,6 @@
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wan_blue {
                        function = LED_FUNCTION_WAN;
                        color = <LED_COLOR_ID_BLUE>;
@@ -71,3 +64,10 @@
        nvmem-cells = <&macaddr_uboot_1fc00 (-1)>;
        nvmem-cell-names = "mac-address";
 };
+
+&wmac {
+       led {
+               led-sources = <8>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
index 549bf4fea420300778098ef23d65549ae9f9e3ce..54b398a2127e3698b95736590f9126c4d85f485b 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
@@ -29,13 +29,6 @@
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_BLUE>;
-                       gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                wan_blue {
                        function = LED_FUNCTION_WAN;
                        color = <LED_COLOR_ID_BLUE>;
@@ -74,3 +67,10 @@
        nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
 };
+
+&wmac {
+       led {
+               led-sources = <7>;
+               led-active-low;
+       };
+};

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
index 04aa4bc5f9e3b7685bc0ceb27d3725c4da0999d4..408ca0f380cce977e9fb0ff9dd435108c117fcd9 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr941hp-v1.dts
@@ -26,12 +26,6 @@
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
-               wifi {
-                       label = "blue:wifi";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-
                led_power: power {
                        function = LED_FUNCTION_POWER;
                        color = <LED_COLOR_ID_BLUE>;
@@ -180,4 +174,9 @@
 
        nvmem-cells = <&macaddr_config_8 0>, <&cal_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
+
+       led {
+               led-sources = <8>;
+               led-active-low;
+       };
 };