ath79: remove model name from LED labels

Currently, we request LED labels in OpenWrt to follow the scheme

  modelname:color:function

However, specifying the modelname at the beginning is actually
entirely useless for the devices we support in OpenWrt. On the
contrary, having this part actually introduces inconvenience in
several aspects:

  - We need to ensure/check consistency with the DTS compatible
  - We have various exceptions where not the model name is used,
    but the vendor name (like tp-link), which is hard to track
    and justify even for core-developers
  - Having model-based components will not allow to share
    identical LED definitions in DTSI files
  - The inconsistency in what's used for the model part complicates
    several scripts, e.g. board.d/01_leds or LED migrations from
    ar71xx where this was even more messy

Apart from our needs, upstream has deprecated the label property
entirely and introduced new properties to specify color and
function properties separately. However, the implementation does
not appear to be ready and probably won't become ready and/or
match our requirements in the foreseeable future.

However, the limitation of generic LEDs to color and function
properties follows the same idea pointed out above. Generic LEDs
will get names like "green:status" or "red:indicator" then, and
if a "devicename" is prepended, it will be the one of an internal
device, like "phy1:amber:status".

With this patch, we move into the same direction, and just drop
the boardname from the LED labels. This allows to consolidate
a few definitions in DTSI files (will be much more on ramips),
and to drop a few migrations compared to ar71xx that just changed
the boardname. But mainly, it will liberate us from a completely
useless subject to take care of for device support review and
maintenance.
To also drop the boardname from existing configurations, a simple
migration routine is added unconditionally.

Although this seems unfamiliar at first look, a quick check in kernel
for the arm/arm64 dts files revealed that while 1033 lines have
labels with three parts *:*:*, still 284 actually use a two-part
labelling *:*, and thus is also acceptable and not even rare there.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
index 89ddf129989553745daaa0cf73cc90f08f00b994..f0d262c847d39c2430e3b843eb2993cf645c58d4 100644 (file)
--- a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
+++ b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
@@ -20,34 +20,34 @@
                compatible = "gpio-leds";
 
                led_router: router {
-                       label = "wn-ag300dgr:green:router";
+                       label = "green:router";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                children {
-                       label = "wn-ag300dgr:green:children";
+                       label = "green:children";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                eco {
-                       label = "wn-ag300dgr:green:eco";
+                       label = "green:eco";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                notification {
-                       label = "wn-ag300dgr:amber:notification";
+                       label = "amber:notification";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "wn-ag300dgr:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "wn-ag300dgr:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
index bc20d70eed38337363daa8905ae16a0ea3ab9c94..787b516056d0abf5ce4b0f125628d968831c0c4f 100644 (file)
--- a/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
+++ b/target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
@@ -36,18 +36,18 @@
                compatible = "gpio-leds";
 
                ops {
-                       label = "wlr-7100:white:ops";
+                       label = "white:ops";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "wlr-7100:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "wlr-7100:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
index 733479ff4e61ed52fcdb17bafe862d7a3258a7c9..e34c304b47486b7c79f4bc2f1f620143a701eab5 100644 (file)
--- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
+++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
@@ -16,33 +16,33 @@
                compatible = "gpio-leds";
 
                led_user: user {
-                       label = "mikrotik:yellow:user";
+                       label = "yellow:user";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                led1 {
-                       label = "mikrotik:green:led1";
+                       label = "green:led1";
                        gpios = <&cpld_gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led2 {
-                       label = "mikrotik:green:led2";
+                       label = "green:led2";
                        gpios = <&cpld_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                led3 {
-                       label = "mikrotik:green:led3";
+                       label = "green:led3";
                        gpios = <&cpld_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                led4 {
-                       label = "mikrotik:green:led4";
+                       label = "green:led4";
                        gpios = <&cpld_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led5 {
-                       label = "mikrotik:green:led5";
+                       label = "green:led5";
                        gpios = <&cpld_gpio 8 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
index 17e42d7ba02c34a4eecdf41bd2c4719a62f63c0e..344241a3226d3ece60df4ad3bc32f903d746f4fb 100644 (file)
--- a/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
+++ b/target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
@@ -21,24 +21,24 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "bluesocket:green:wifi5g";
+                       label = "green:wifi5g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan2g {
-                       label = "bluesocket:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_status_green: status_green {
-                       label = "bluesocket:green:status";
+                       label = "green:status";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                led_status_yellow: status_yellow {
-                       label = "bluesocket:yellow:status";
+                       label = "yellow:status";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index d7f1a0711f35c325833e92f17d3762e02ce99c74..65c0be073b63d639ad7451b34b2d26f0122f8927 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -32,23 +32,23 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "ap-105:green:power";
+                       label = "green:power";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: power_red {
-                       label = "ap-105:red:power";
+                       label = "red:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
                wifi_2g_red {
-                       label = "ap-105:red:wlan2g";
+                       label = "red:wlan2g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wifi_5g_red {
-                       label = "ap-105:red:wlan5g";
+                       label = "red:wlan5g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,13 +57,13 @@
                compatible = "gpio-leds";
 
                wifi_2g_green {
-                       label = "ap-105:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi_5g_green {
-                       label = "ap-105:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 1a509d864e74f006dac9d3b7a8c962390acd1c20..053c91557b47e1c1ade08b6c5a9a417c5b7f8764 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -23,7 +23,7 @@
                compatible = "gpio-leds";
 
                led_diag: diag {
-                       label = "buffalo:red:diag";
+                       label = "red:diag";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
        };
@@ -32,41 +32,41 @@
                compatible = "gpio-leds";
 
                band2g_a {
-                       label = "buffalo:amber:band2g";
+                       label = "amber:band2g";
                        gpios = <&ath9k0 1 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "buffalo:green:usb";
+                       label = "green:usb";
                        gpios = <&ath9k0 3 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
                        linux,default-trigger = "usbport";
                };
 
                band2g_g {
-                       label = "buffalo:green:band2g";
+                       label = "green:band2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                band5g_g {
-                       label = "buffalo:green:band5g";
+                       label = "green:band5g";
                        gpios = <&ath9k1 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                router {
-                       label = "buffalo:green:router";
+                       label = "green:router";
                        gpios = <&ath9k1 3 GPIO_ACTIVE_LOW>;
                };
 
                movie_engine {
-                       label = "buffalo:blue:movie_engine";
+                       label = "blue:movie_engine";
                        gpios = <&ath9k1 4 GPIO_ACTIVE_LOW>;
                };
 
                band5g_a {
-                       label = "buffalo:amber:band5g";
+                       label = "amber:band5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index c67b94b117289a481f005a47bdc8fd3e3f5f8c74..85fd54b396bab96120bc99e7fc54d7781706f012 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -27,35 +27,35 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "d-link:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
                        linux,default-trigger = "usbport";
                };
 
                led_power_orange: power_orange {
-                       label = "d-link:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_blue: power_blue {
-                       label = "d-link:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "d-link:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                planet_orange {
-                       label = "d-link:orange:planet";
+                       label = "orange:planet";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                planet_blue {
-                       label = "d-link:blue:planet";
+                       label = "blue:planet";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -64,13 +64,13 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "d-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "d-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
index abcecd04069370df560934b8701c5d5f1acf54d4..8a27452eb8323b2edd73135a6d43a5188ee80fcc 100644 (file)
--- a/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
+++ b/target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
@@ -36,17 +36,17 @@
                compatible = "gpio-leds";
 
                led_d2: d2 {
-                       label = "ja76pf2:green:d2";
+                       label = "green:d2";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                d3 {
-                       label = "ja76pf2:green:d3";
+                       label = "green:d3";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
                d4 {
-                       label = "ja76pf2:green:d4";
+                       label = "green:d4";
                        gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index fa7e60728875cfcd7ed83d8fd4bfc938d65b06ab..afc49ce86517a091bfbf9286f331dcceba1e5ff1 100644 (file)
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -27,38 +27,38 @@
                compatible = "gpio-leds";
 
                wifi1 {
-                       label = "mr16:green:wifi1";
+                       label = "green:wifi1";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                wifi2 {
-                       label = "mr16:green:wifi2";
+                       label = "green:wifi2";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wifi3 {
-                       label = "mr16:green:wifi3";
+                       label = "green:wifi3";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wifi4 {
-                       label = "mr16:green:wifi4";
+                       label = "green:wifi4";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "mr16:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power_orange {
-                       label = "mr16:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
                led_power_green: power_green {
-                       label = "mr16:green:power";
+                       label = "green:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index db47126623019ff8d1dfaa804ffda1d297a8ce6f..9e41b6135748a3d38bace3b3a5cc907ed8493210 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -25,7 +25,7 @@
                compatible = "reset-leds";
 
                usb_led {
-                       label = "netgear:green:usb";
+                       label = "green:usb";
                        resets = <&rst 12>;
                        trigger-sources = <&usb_ohci_port>, <&usb_ehci_port>;
                        linux,default-trigger = "usbport";
@@ -36,28 +36,28 @@
                compatible = "gpio-leds";
 
                wps {
-                       label = "netgear:orange:wps";
+                       label = "orange:wps";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power_orange {
-                       label = "netgear:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
        };
@@ -66,12 +66,12 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "netgear:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
                wlan5g {
-                       label = "netgear:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
index 22ae58929cc202e0c7de713383c9f93f16361e2e..3c1d97f25e27fde08a55b7ba0276737ebfb40497 100644 (file)
--- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
+++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts
@@ -28,34 +28,34 @@
                compatible = "gpio-leds";
 
                led_power_green: led_power_green {
-                       label = "ws-ap3610:green:power";
+                       label = "green:power";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: led_power_red {
-                       label = "ws-ap3610:red:power";
+                       label = "red:power";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan5_blue {
-                       label = "ws-ap3610:blue:wlan5";
+                       label = "blue:wlan5";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_wlan5_green {
-                       label = "ws-ap3610:green:wlan5";
+                       label = "green:wlan5";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan2_blue {
-                       label = "ws-ap3610:blue:wlan2";
+                       label = "blue:wlan2";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                led_wlan2_green {
-                       label = "ws-ap3610:green:wlan2";
+                       label = "green:wlan2";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
index 16407128ab0d93e9dbad75f1933e4f7395760f90..cd0e5015a96cf63fb294dd0d481604871e656388 100644 (file)
--- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
+++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
@@ -24,7 +24,7 @@
                compatible = "gpio-leds";
 
                led_rf: rf_green {
-                       label = "ubnt:green:rf";
+                       label = "green:rf";
                        gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index 576f84d88cd07a59ca6a852761eb0d98bd632a9a..e93c5ca652a66cad33e99394654d16a4e2409ef3 100644 (file)
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -55,42 +55,42 @@
                pinctrl-0 = <&switch_led_pins>;
 
                security {
-                       label = "whr-g301n:orange:security";
+                       label = "orange:security";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led_diag: diag {
-                       label = "whr-g301n:red:diag";
+                       label = "red:diag";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                router {
-                       label = "whr-g301n:green:router";
+                       label = "green:router";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "whr-g301n:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "whr-g301n:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "whr-g301n:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "whr-g301n:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "whr-g301n:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -99,7 +99,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "whr-g301n:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 511216838cc76511aa9de3f10a19b68be99c2c5a..b632d3b8a82b354e4b779326979d3918ce5dbdba 100644 (file)
--- a/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
+++ b/target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts
@@ -40,47 +40,47 @@
                pinctrl-0 = <&switch_led_pins>;
 
                led_power_green: power_green {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_amber: power_amber {
-                       label = "d-link:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "d-link:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "d-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "d-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "d-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "d-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "d-link:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
 
                wan_green {
-                       label = "d-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -89,7 +89,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "d-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
index d8f98ba6c0d42f6d6746e4d36576eb08d1323534..4752ad1edd5b37eff5c097e07dd1dde470393ff7 100644 (file)
--- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
+++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
@@ -34,27 +34,27 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                rssilow {
-                       label = "enh202-v1:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                rssimedium {
-                       label = "enh202-v1:amber:rssimedium";
+                       label = "amber:rssimedium";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "enh202-v1:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "enh202-v1:amber:lan";
+                       label = "amber:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "enh202-v1:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -63,7 +63,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "enh202-v1:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index ec0001b86788d668740ebc8f82a375b37d45ad9f..d67af04d1cbd858d2e9041227177ee1f1c9a0cb6 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -54,63 +54,63 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan1_green {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan1_amber {
-                       label = "netgear:amber:lan1";
+                       label = "amber:lan1";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan2_green {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan2_amber {
-                       label = "netgear:amber:lan2";
+                       label = "amber:lan2";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                lan3_green {
-                       label = "netgear:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3_amber {
-                       label = "netgear:amber:lan3";
+                       label = "amber:lan3";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan4_green {
-                       label = "netgear:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan4_amber {
-                       label = "netgear:amber:lan4";
+                       label = "amber:lan4";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };
@@ -119,12 +119,12 @@
                compatible = "gpio-leds";
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
                };
 
                wlan_blue {
-                       label = "netgear:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index f3d06b5fd5f9c806834471a0ce53ddf25c6b0a0c..44dbe9c55ec7eddef1a295a478d4b4f69b3bae6e 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -33,22 +33,22 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                led_power: power {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,7 +57,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "netgear:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7240_tplink.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi
index 7e54cd46b1177d6c860ff3e5fbb2bfe5b13d7f1e..23d12e4edf77c16b58e5671662c73bca251c967b 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink.dtsi
@@ -39,12 +39,12 @@
                pinctrl-0 = <&pinmux_switch_led_pins>;
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -53,7 +53,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
index 7ec0469dcd6683a429fc202e7f43a0b0aee6c0f1..e0ac582f9dcf2e04818f9c49b27633e7ca01e26e 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi
@@ -4,7 +4,7 @@
 
 &leds {
        lan {
-               label = "tp-link:green:lan";
+               label = "green:lan";
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index 5ceada8375622675f9b1e0b02960715da0d73a09..bd6caacdf670192b0b72aac08e0c03b6ba67df29 100644 (file)
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -4,27 +4,27 @@
 
 &leds {
        lan1 {
-               label = "tp-link:green:lan1";
+               label = "green:lan1";
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
        };
 
        lan2 {
-               label = "tp-link:green:lan2";
+               label = "green:lan2";
                gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
        };
 
        lan3 {
-               label = "tp-link:green:lan3";
+               label = "green:lan3";
                gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
        };
 
        lan4 {
-               label = "tp-link:green:lan4";
+               label = "green:lan4";
                gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
        };
 
        wan {
-               label = "tp-link:green:wan";
+               label = "green:wan";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index 1b303711a8e657e2254325766c831440c218711d..1b124f3f2e6bbfb006c1f78479530c1131e961ed 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -57,57 +57,57 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                lan1_green {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan1_amber {
-                       label = "netgear:amber:lan1";
+                       label = "amber:lan1";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                lan2_green {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan2_amber {
-                       label = "netgear:amber:lan2";
+                       label = "amber:lan2";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan3_green {
-                       label = "netgear:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3_amber {
-                       label = "netgear:amber:lan3";
+                       label = "amber:lan3";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan4_green {
-                       label = "netgear:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan4_amber {
-                       label = "netgear:amber:lan4";
+                       label = "amber:lan4";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
        };
@@ -116,18 +116,18 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&ath9k 3 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan_blue {
-                       label = "netgear:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
index ec4dd871cc9b2d003d1fee8f9191205f0e8a9ba7..62614166db2982cdf04a4d167218eaaa0ef99806 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -51,62 +51,62 @@
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                lan1_green {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan1_amber {
-                       label = "netgear:amber:lan1";
+                       label = "amber:lan1";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan2_green {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan2_amber {
-                       label = "netgear:amber:lan2";
+                       label = "amber:lan2";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan3_green {
-                       label = "netgear:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3_amber {
-                       label = "netgear:amber:lan3";
+                       label = "amber:lan3";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                lan4_green {
-                       label = "netgear:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan4_amber {
-                       label = "netgear:amber:lan4";
+                       label = "amber:lan4";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                usb_green {
-                       label = "netgear:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
@@ -117,18 +117,18 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan_blue {
-                       label = "netgear:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index 3cbedc3bf8fa6b62207e3115181e09f0d722eb1e..62884f09026265b20997e9850c8f7d55a7fa3337 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -36,12 +36,12 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
index 9d0f34924f2b58ac7613d2fe0ad00ee0c0c4d515..af8e297b1df842e5ab33bc089d31ac3ee38732f8 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
@@ -10,7 +10,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
index e39f2ee3f95b0bb18a9202a325e648a0973516da..cae2f5477d652c9c5800026fa66909b24f6939d1 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
@@ -10,7 +10,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
index 9d4f3f20273ff78ab970651d7ea5a6fd32f55fb1..218ea5e4296c3f8adc63418abf4ea0978cf64047 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
@@ -17,7 +17,7 @@
 
 &leds {
        led3g {
-               label = "tp-link:green:3g";
+               label = "green:3g";
                gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
index cc138cd59f82e51108eed2960c54501aa683aaae..17e06dfac7d6e7609eefdb4fd77ffb85b68b74f8 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
@@ -10,7 +10,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
index c02154a90232766860b29512b516efbdf7071bec..b0f6c3695a229b453d1be392d8814d6584503f83 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -39,17 +39,17 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led3g {
-                       label = "tp-link:green:3g";
+                       label = "green:3g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
@@ -60,7 +60,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
index db192cd30b126727d6e4b27b454c66490b308194..fcc66c018c7eca5c71ab17fc1fb06c789ac85beb 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
@@ -19,12 +19,12 @@
                compatible = "gpio-leds";
 
                led_globe: globe {
-                       label = "ubnt:green:globe";
+                       label = "green:globe";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                power {
-                       label = "ubnt:green:power";
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 963c241d8101411f77a50d4d01768bef5f60573e..c4c0235f7bdc988a73587f6c3431e90b88d0ae4e 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -37,12 +37,12 @@
                compatible = "gpio-leds";
 
                led_dome_green: dome_green {
-                       label = "ubnt:green:dome";
+                       label = "green:dome";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
                dome_orange {
-                       label = "ubnt:orange:dome";
+                       label = "orange:dome";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
index c4af52a76a79dc4b5abf0b8ed66ff2111303726c..3a002aaedfbd6e87593dc27a6268a29eee1aa7f8 100644 (file)
--- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
+++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts
@@ -32,18 +32,18 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "fritz300e:green:power";
+                       label = "green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                lan {
-                       label = "fritz300e:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "fritz300e:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -53,27 +53,27 @@
                compatible = "gpio-leds";
 
                rssi0 {
-                       label = "fritz300e:green:rssi0";
+                       label = "green:rssi0";
                        gpios = <&ath9k 10 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "fritz300e:green:rssi1";
+                       label = "green:rssi1";
                        gpios = <&ath9k 4 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "fritz300e:green:rssi2";
+                       label = "green:rssi2";
                        gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
                };
 
                rssi3 {
-                       label = "fritz300e:green:rssi3";
+                       label = "green:rssi3";
                        gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
                };
 
                rssi4 {
-                       label = "fritz300e:green:rssi4";
+                       label = "green:rssi4";
                        gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
index 46d7e0f3317ba0267e4db8e9a74d3d13bcc8dde9..3b2dc0ecfc44eff92880d8e5a1891bb2e02715fb 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
@@ -9,7 +9,7 @@
 
 &leds {
        sec_vpn {
-               label = "buffalo:orange:vpn";
+               label = "orange:vpn";
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
index 89e77224ca82ed6dc317f6521bf71d54dc865904..2840f91ec1c51ea7cda08196faf3779481216aed 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
@@ -40,12 +40,12 @@
                compatible = "gpio-leds";
 
                led_diag: diag {
-                       label = "buffalo:red:diag";
+                       label = "red:diag";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "buffalo:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index 1a3aec00fa2161018e19f5d5f8de23074535dddc..f035f86c7ccaeb653acb8d060dff23c04ced036b 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -66,7 +66,7 @@
                compatible = "gpio-leds";
 
                led_diag: diag {
-                       label = "buffalo:red:diag";
+                       label = "red:diag";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
@@ -75,35 +75,35 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "buffalo:blue:usb";
+                       label = "blue:usb";
                        gpios = <&ath9k 4 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
 
                wireless {
-                       label = "buffalo:green:wireless";
+                       label = "green:wireless";
                        gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                security {
-                       label = "buffalo:orange:security";
+                       label = "orange:security";
                        gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
                };
 
                router {
-                       label = "buffalo:green:router";
+                       label = "green:router";
                        gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
                };
 
                movie_engine_on {
-                       label = "buffalo:blue:movie_engine_on";
+                       label = "blue:movie_engine_on";
                        gpios = <&ath9k 8 GPIO_ACTIVE_LOW>;
                };
 
                movie_engine_off {
-                       label = "buffalo:blue:movie_engine_off";
+                       label = "blue:movie_engine_off";
                        gpios = <&ath9k 9 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
index 8bf89e4ecd43fd39a9142f9961281991593f915d..4f186c2c11d6b87fa9137afc5f1a834b2d0c19ce 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
@@ -14,17 +14,17 @@
                compatible = "gpio-leds";
 
                led_movie_engine {
-                       label = "buffalo:blue:movie_engine";
+                       label = "blue:movie_engine";
                        gpios = <&ath9k 13 GPIO_ACTIVE_LOW>;
                };
 
                router {
-                       label = "buffalo:green:router";
+                       label = "green:router";
                        gpios = <&ath9k 14 GPIO_ACTIVE_LOW>;
                };
 
                wireless {
-                       label = "buffalo:green:wireless";
+                       label = "green:wireless";
                        gpios = <&ath9k 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -58,7 +58,7 @@
 
 &leds {
        sec_vpn {
-               label = "buffalo:orange:security";
+               label = "orange:security";
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
index 0ac10a56f9dfb4ddf347ba6e9a3c1f8f0a56065b..dd4cbf03eb8f64c3c01a9fcbf15111aa13363d94 100644 (file)
--- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
@@ -49,12 +49,12 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "tplink:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "tplink:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
@@ -65,13 +65,13 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "tplink:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "tplink:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index 43b24dae5a59b7a42050d015ac6837bbc6229054..52e83ea8d00e0f53ae9721a3f631615f035b81b1 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -24,7 +24,7 @@
                compatible = "gpio-leds";
 
                led_usr: usr {
-                       label = "ubnt:yellow:usr";
+                       label = "yellow:usr";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
index a28f8fbcd404d6d6822b571608b0cd4292ecc525..eab08d1d7444ea193a0bf7263f8d662a98352d53 100644 (file)
--- a/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
+++ b/target/linux/ath79/dts/ar724x_ubnt_xm_outdoor.dtsi
@@ -11,22 +11,22 @@
                compatible = "gpio-leds";
 
                link1 {
-                       label = "ubnt:red:link1";
+                       label = "red:link1";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
                link2 {
-                       label = "ubnt:orange:link2";
+                       label = "orange:link2";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                link3 {
-                       label = "ubnt:green:link3";
+                       label = "green:link3";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
                led_link4: link4 {
-                       label = "ubnt:green:link4";
+                       label = "green:link4";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
index 662ffa2e5c608004c0431aee8c7dc49810d607c7..c8697d193d6e83bbf08b8a9698b74391012be7b1 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
@@ -45,17 +45,17 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
index 3ff992a8413bd4b98370fca2b5085da52b1e360f..e17303a0fbc01465f82a9920174cb1c35c75212b 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -45,25 +45,25 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index a35dbc2d1a77629252a9b4e96328974700b5c69c..ad517d8bafb39f69f13517986ca363bfb1852d81 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -39,22 +39,22 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                qss_r {
-                       label = "tp-link:red:qss";
+                       label = "red:qss";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
                qss_g {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
index b0d68fb35f9c311af1b9ed416e8e676886a9c118..15e29f552ef7f383d0eadaf83e2212a2b2b67d95 100644 (file)
--- a/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
+++ b/target/linux/ath79/dts/ar9330_dlink_dir-505.dts
@@ -39,12 +39,12 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                led_power_green: power {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: status {
-                       label = "d-link:red:status";
+                       label = "red:status";
                        gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
index 389c6d1e4b5481bb6d265be57f7bd5dbaaec27e0..26b3b3f04cb2448aaf7138c7719f3ec50c6f3e53 100644 (file)
--- a/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
@@ -22,18 +22,18 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "gl-ar150:orange:wlan";
+                       label = "orange:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                configurable {
-                       label = "gl-ar150:green:configurable";
+                       label = "green:configurable";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                led_power: power {
-                       label = "gl-ar150:green:power";
+                       label = "green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index a551a4a4f46849268c9f2e7a8e23d536a086a900..7d04b0137723574a057d6a021eb329a476fbad45 100644 (file)
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -20,13 +20,13 @@
                compatible = "gpio-leds";
 
                led_wlan: wlan {
-                       label = "air-pen:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "air-pen:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index de6d9f85d7177cc3c3908d3fbf23faa9886f2dc8..85e70495fcfbe7502ede741c9391d70e35307141 100644 (file)
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -18,18 +18,18 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "carambola2:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                eth0 {
-                       label = "carambola2:orange:eth0";
+                       label = "orange:eth0";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                eth1 {
-                       label = "carambola2:orange:eth1";
+                       label = "orange:eth1";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
index bfb6d3152c67bc0f50f20d72552885971c047f90..0465109bc3a3a55d69a3d70615992db4e32ec92e 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
@@ -5,26 +5,6 @@
 / {
        model = "ALFA Network AP121F";
        compatible = "alfa-network,ap121f", "qca,ar9331";
-
-       leds {
-               compatible = "gpio-leds";
-
-               lan {
-                       label = "ap121f:green:lan";
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-               };
-
-               led_vpn: vpn {
-                       label = "ap121f:green:vpn";
-                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "ap121f:green:wlan";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };
 
 &usb {

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
index 74d65d828a2a7760024416df240149d2749f9b72..50605bf6858dd9ab92f7fb06adbbd94955786b1e 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi
@@ -31,6 +31,26 @@
                        debounce-interval = <60>;
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+
+               lan {
+                       label = "green:lan";
+                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+               };
+
+               led_vpn: vpn {
+                       label = "green:vpn";
+                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+               };
+
+               wlan {
+                       label = "green:wlan";
+                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "phy0tpt";
+               };
+       };
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts
index 178a32f4d0fd0888db6557cebb93c15c7dbdce76..873e92cdfb71842e7cd7430f0cf76d592bf04f63 100644 (file)
--- a/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts
+++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts
@@ -5,26 +5,6 @@
 / {
        model = "ALFA Network AP121FE";
        compatible = "alfa-network,ap121fe", "qca,ar9331";
-
-       leds {
-               compatible = "gpio-leds";
-
-               lan {
-                       label = "ap121fe:green:lan";
-                       gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-               };
-
-               led_vpn: vpn {
-                       label = "ap121fe:green:vpn";
-                       gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "ap121fe:green:wlan";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };
 
 &usb {

diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts
index e00a8c638e3fc6f47242f6668ba0bb9bf8e34c57..8ce5beb05929fa4f35edb32deb6a9e08c8b560a5 100644 (file)
--- a/target/linux/ath79/dts/ar9331_arduino_yun.dts
+++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts
@@ -53,13 +53,13 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "yun:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                usb {
-                       label = "yun:white:usb";
+                       label = "white:usb";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index d0f9f9b724b5db83ef3a679a60198a6d72433f34..93031214085c223a43c3079dbf7d4da18577f4d1 100644 (file)
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -21,7 +21,7 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "dorin:green:status";
+                       label = "green:status";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index 9df6de168543fa52ae34fbc7a76b55048aa5ec5e..0d7b7cfb84c1a35542132d303c6bbd0dedf2f368 100644 (file)
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -31,22 +31,22 @@
                pinctrl-0 = <&switch_led_disable_pins>;
 
                modbus {
-                       label = "eg200:red:modbus";
+                       label = "red:modbus";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
 
                led_etactica: etactica {
-                       label = "eg200:red:etactica";
+                       label = "red:etactica";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                eth0 {
-                       label = "eg200:red:eth0";
+                       label = "red:eth0";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "eg200:red:wlan";
+                       label = "red:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
index c96aaa22222012832bad9e54aa755f44b54b3a48..8cdc9ac4ca6c9652906fefb42f493427e38a8ba6 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
+++ b/target/linux/ath79/dts/ar9331_glinet_64xx.dtsi
@@ -26,13 +26,13 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "gl-inet:red:wlan";
+                       label = "red:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "gl-inet:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
index ead81adc5543b92e15030b6d93ef27360a84525d..d62bdd9d6727ed4e38f30079c30699d738a98679 100644 (file)
--- a/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
+++ b/target/linux/ath79/dts/ar9331_glinet_gl-mifi.dts
@@ -18,23 +18,23 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "gl-mifi:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "gl-mifi:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
 
                wan {
-                       label = "gl-mifi:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
                };
 
                3g4g {
-                       label = "gl-mifi:green:3g4g";
+                       label = "green:3g4g";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dts b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dts
index 8b9ece07ef1608edb389bda6c481e7cf2180d148..6a756ed30b0a88c8e29437bedef760b3c6a4d12a 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dts
@@ -19,7 +19,7 @@
                pinctrl-0 = <&switch_led_disable_pins>;
 
                led_system: system {
-                       label = "lan-turtle:orange:system";
+                       label = "orange:system";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_hak5_packet-squirrel.dts b/target/linux/ath79/dts/ar9331_hak5_packet-squirrel.dts
index d19214d3f4b314f45291fe909915aa2994fb1572..787dbed9c7f0541ccfbc08d7bf674fdc3109f706 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_packet-squirrel.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_packet-squirrel.dts
@@ -17,17 +17,17 @@
                compatible = "gpio-leds";
 
                led_system_green: system-green {
-                       label = "packet-squirrel:green:system";
+                       label = "green:system";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                system-blue {
-                       label = "packet-squirrel:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                system-red {
-                       label = "packet-squirrel:red:system";
+                       label = "red:system";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
index 0a9cf9566f6904e2cbb8275864cc24be8c8e04a2..6bc0773b9b084b0b138ea12a847aeec1bcc3d3d2 100644 (file)
--- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
+++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts
@@ -53,7 +53,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "wifi-pineapple-nano:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
index 40ebcccd2b7ccf9bf82b564784e078c4db2ff6a9..8632011de3a7779658ead87e896f3e261e69cbf7 100644 (file)
--- a/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_ts-d084.dts
@@ -33,7 +33,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "ts-d084:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
index 812b5b0ec7e5f6ce2e3d1bf2b8b3ec7449df55ae..cdc92f697db40ff130fd3e8ac4c6b5bf23887be4 100644 (file)
--- a/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
+++ b/target/linux/ath79/dts/ar9331_pisen_wmm003n.dts
@@ -32,7 +32,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "pisen:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 5ea2569fed405eca90de61c275d1da88c8c8f2aa..7c52ae1617171fd058813d5543e32085888e6969 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -22,23 +22,23 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                led_wps: wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
 
                led3g {
-                       label = "tp-link:green:3g";
+                       label = "green:3g";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index 2c8dddbe5e9bfa1e35b08fa9a6c09104937ffc5b..da04aad6cb1e46b86f7a62d32227b7cfed213cb5 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -23,18 +23,18 @@
                pinctrl-0 = <&switch_led_disable_pins>;
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_lan: lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                led3g {
-                       label = "tp-link:green:3g";
+                       label = "green:3g";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
index 236609d958e89516a2cb390b405dc1fb3861ce24..4ea658713d502f23b807005f1f3383fe4563e1f9 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
@@ -30,7 +30,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tl-wr703n:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
index b8a4fe96b5609d96869c478cc54c301ef47119dd..db43484112fb2ee780e93766411996f5b2a719de 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
@@ -30,7 +30,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tl-wr710n:green:system";
+                       label = "green:system";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index ed120b47762cc92909a61d305787722ee005543e..c1d88f48123d98b35c1d7c1eaa82f5d5c801b2c7 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -43,42 +43,42 @@
                pinctrl-0 = <&switch_led_disable_pins>;
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 354e276f7b5cf1e89b14142b86d56e74579707ab..da1e59d4c321d23783a2002f8a04c0e8a1d54e4d 100644 (file)
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -32,29 +32,29 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "ens202ext-v1:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "ens202ext-v1:amber:wlan";
+                       label = "amber:wlan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssilow {
-                       label = "ens202ext-v1:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rssimedium {
-                       label = "ens202ext-v1:amber:rssimedium";
+                       label = "amber:rssimedium";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                rssihigh {
-                       label = "ens202ext-v1:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index d3fd4f114bf869103b31dc79f1e39e956372f244..7eafd1acd46166ec07fa1fe608b2533f60d8335f 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -42,39 +42,39 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "pcs:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "pcs:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan {
-                       label = "pcs:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "pcs:blue:lan1";
+                       label = "blue:lan1";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "pcs:blue:lan2";
+                       label = "blue:lan2";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "pcs:blue:lan3";
+                       label = "blue:lan3";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "pcs:blue:lan4";
+                       label = "blue:lan4";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
index 685afa5b743003a6cf9c1604c500fe85c2251299..7057c3b1adf230f684c72b3dfd48f4d82e2bb6e4 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
+++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
@@ -64,32 +64,32 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                volume1 {
-                       label = "wmb001n:blue:volume1";
+                       label = "blue:volume1";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
                volume2 {
-                       label = "wmb001n:blue:volume2";
+                       label = "blue:volume2";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                volume3 {
-                       label = "wmb001n:blue:volume3";
+                       label = "blue:volume3";
                        gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
                };
 
                volume4 {
-                       label = "wmb001n:blue:volume4";
+                       label = "blue:volume4";
                        gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
                };
 
                volume5 {
-                       label = "wmb001n:blue:volume5";
+                       label = "blue:volume5";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
                led_wifi: wifi {
-                       label = "wmb001n:blue:wifi";
+                       label = "blue:wifi";
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi
index dc97b103a4cf14c20b348638ca90e6d7bea37584..f229a1917e11bd62033c1aeab8011b197b14c314 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink.dtsi
@@ -19,44 +19,44 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index 460277c077c7e790117309a848649f650facd03e..750522ded1e63d0be735b2c66c5ce51486d1b640 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -27,7 +27,7 @@
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
index b3de436e92e889c86ea030fc320f68d71d8556e9..12755aea2fa85df4479892b00f6136e875355bff 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa850re-v1.dts
@@ -35,43 +35,43 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tp-link:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_re: re {
-                       label = "tp-link:blue:re";
+                       label = "blue:re";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                signal1 {
-                       label = "tp-link:blue:signal1";
+                       label = "blue:signal1";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                signal2 {
-                       label = "tp-link:blue:signal2";
+                       label = "blue:signal2";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                signal3 {
-                       label = "tp-link:blue:signal3";
+                       label = "blue:signal3";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                signal4 {
-                       label = "tp-link:blue:signal4";
+                       label = "blue:signal4";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                signal5 {
-                       label = "tp-link:blue:signal5";
+                       label = "blue:signal5";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
index 36abbb1c313f42c0b9658446945216bb0bc8d84f..9f540f82d959119e9414ed561f4a9f75573317d5 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts
@@ -42,29 +42,29 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_orange: power_orange {
-                       label = "tp-link:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wlan_green {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan_orange {
-                       label = "tp-link:orange:wlan";
+                       label = "orange:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
index 420d03861f670acadee9b4c636923718e6349d73..4a4e51f4b8acccb444013837ae8cd5b7b67eb992 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa901nd-v3.dts
@@ -28,23 +28,23 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index 0932fe9da216ceb2224de8385cfc02a79e9fb6f3..cb6b25e6646220dd2ce470e150138e05a35c0c09 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -37,7 +37,7 @@
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
index bd088a39cfba8bc094a022a2700292c250dc5da9..58845f4cb622063a15da8d7b999de9359910ec28 100644 (file)
--- a/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
+++ b/target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
@@ -20,13 +20,13 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "etg3-r:green:power";
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                notification {
-                       label = "etg3-r:green:notification";
+                       label = "green:notification";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
index 38cd0581342a516130469972d2e0c63a368ae356..6f6e4c6bb64992c39836f1540e5a33de6932a121 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts
@@ -16,22 +16,22 @@
                compatible = "gpio-leds";
 
                rssi0 {
-                       label = "ubnt:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "ubnt:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "ubnt:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_rssi3: rssi3 {
-                       label = "ubnt:blue:rssi3";
+                       label = "blue:rssi3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
index 4fcb7cd139a448ce98851f449f5d9326f0190e01..6114650ac5457a9180e162c60a9cd9c2dfa58df0 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
@@ -16,22 +16,22 @@
                compatible = "gpio-leds";
 
                rssi0 {
-                       label = "ubnt:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "ubnt:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "ubnt:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_rssi3: rssi3 {
-                       label = "ubnt:blue:rssi3";
+                       label = "blue:rssi3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
index 68b608a0172aaee10b63a698e2234b923ef0cccf..7e4b9cd415d2361d44ba36b85d5753a77b2412ed 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts
@@ -16,22 +16,22 @@
                compatible = "gpio-leds";
 
                rssi0 {
-                       label = "ubnt:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "ubnt:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "ubnt:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_rssi3: rssi3 {
-                       label = "ubnt:blue:rssi3";
+                       label = "blue:rssi3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index a0012a746171a104d6a177c532720c45c2f818af..ff4e177ca8e82f3c0c80bbcbcfc0c7f54de1b15b 100644 (file)
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -21,22 +21,22 @@
                compatible = "gpio-leds";
 
                link1 {
-                       label = "ubnt:red:link1";
+                       label = "red:link1";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                link2 {
-                       label = "ubnt:orange:link2";
+                       label = "orange:link2";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                link3 {
-                       label = "ubnt:green:link3";
+                       label = "green:link3";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_link4: link4 {
-                       label = "ubnt:green:link4";
+                       label = "green:link4";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
index c3ac48647162e05b743e147407bc4fc7d7da3f60..aed25e2f6786b66752654932e6ef756262cd2b56 100644 (file)
--- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
+++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
@@ -36,12 +36,12 @@
                compatible = "gpio-leds";
 
                led_power_orange: power_orange {
-                       label = "hiveap-121:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power_white: power_white {
-                       label = "hiveap-121:white:power";
+                       label = "white:power";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
index 26d9a33a930d58f6ee2b5af6a962fa178a65a579..75893a5e33d81efeb400586a07c278b037631ff5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
+++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
@@ -42,37 +42,37 @@
                compatible = "gpio-leds";
 
                lan1 {
-                       label = "n5q:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "n5q:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                led_signal4: signal4 {
-                       label = "n5q:green:signal4";
+                       label = "green:signal4";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                signal1 {
-                       label = "n5q:red:signal1";
+                       label = "red:signal1";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                signal2 {
-                       label = "n5q:orange:signal2";
+                       label = "orange:signal2";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                signal3 {
-                       label = "n5q:green:signal3";
+                       label = "green:signal3";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "n5q:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
index 0bbde9ebfd1f10e79ac4f75691667b325bfd536d..95f798cc0f0e80910aa86f819ab53e93fe23c986 100644 (file)
--- a/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
+++ b/target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
@@ -24,38 +24,38 @@
                pinctrl-0 = <&led_rssimediumhigh_pin>;
 
                wan {
-                       label = "cf-e120a-v3:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e120a-v3:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e120a-v3:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssilow {
-                       label = "cf-e120a-v3:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e120a-v3:red:rssimediumlow";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e120a-v3:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "cf-e120a-v3:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
index c2dfa6ba2d5eea5ca2dae14dd60ffec1aaccdc38..a6a48110531f7d0e7a078b7471b5ed37125d6b28 100644 (file)
--- a/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
+++ b/target/linux/ath79/dts/ar9344_compex_wpj344-16m.dts
@@ -21,27 +21,27 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "wpj344:green:status";
+                       label = "green:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                sig1 {
-                       label = "wpj344:red:sig1";
+                       label = "red:sig1";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                sig2 {
-                       label = "wpj344:yellow:sig2";
+                       label = "yellow:sig2";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                sig3 {
-                       label = "wpj344:green:sig3";
+                       label = "green:sig3";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                sig4 {
-                       label = "wpj344:green:sig4";
+                       label = "green:sig4";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
index 59ec9451fcac81fdc6c107be4302a93219e88eb1..a35c177b3c60541ef0928630f886586aaa6e3f37 100644 (file)
--- a/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
+++ b/target/linux/ath79/dts/ar9344_devolo_magic-2-wifi.dts
@@ -20,18 +20,18 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "devolo:white:wlan";
+                       label = "white:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                led_dlan_white: dlan_white {
-                       label = "devolo:white:dlan";
+                       label = "white:dlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_dlan_red: dlan_red {
-                       label = "devolo:red:dlan";
+                       label = "red:dlan";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
index 2c242a1b0ae63ad94873444bb6db6591a9fde86b..bd4c58f3c903c9f170fd299d3d6722e9ba00a420 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
@@ -21,40 +21,40 @@
                pinctrl-0 = <&enable_gpio_11>;
 
                led_power_blue: power_blue {
-                       label = "d-link:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "d-link:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port1>;
                };
 
                wan_blue {
-                       label = "d-link:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "d-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "d-link:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power_orange {
-                       label = "d-link:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
-                       label = "d-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };
@@ -63,7 +63,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "d-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
index 17c58073d5610d75861fb297843abebf8ab617dd..189945848dad0cd0f3be2d06a207d1f55321b666 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
@@ -18,27 +18,27 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
-                       label = "d-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "d-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_power_orange: power_orange {
-                       label = "d-link:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan_orange {
-                       label = "d-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
index 35d6c55b596833f32176f8312c35932209275082..26e98f87119e5595c537c640715988198f35238c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
+++ b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
@@ -45,27 +45,27 @@
                pinctrl-0 = <&enable_gpio_11 &enable_gpio_16>;
 
                led_power_green: power_green {
-                       label = "ws-ap3705i:green:power";
+                       label = "green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: power_red {
-                       label = "ws-ap3705i:red:power";
+                       label = "red:power";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan_blue {
-                       label = "ws-ap3705i:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
                };
 
                lan_green {
-                       label = "ws-ap3705i:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
                };
 
                radio2 {
-                       label = "ws-ap3705i:green:radio2";
+                       label = "green:radio2";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -75,7 +75,7 @@
                compatible = "gpio-leds";
 
                radio1 {
-                       label = "ws-ap3705i:green:radio1";
+                       label = "green:radio1";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
index e95ffc787aaf00e012c69a555bac6e023a9f7583..789069632b24fdb2fc65f6480601f59dddc2530d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi
@@ -21,38 +21,38 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "mikrotik:green:power";
+                       label = "green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                rssilow {
-                       label = "mikrotik:green:rssilow";
+                       label = "green:rssilow";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "mikrotik:green:rssimediumlow";
+                       label = "green:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimedium {
-                       label = "mikrotik:green:rssimedium";
+                       label = "green:rssimedium";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "mikrotik:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                rssihigh {
-                       label = "mikrotik:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                led_user: user {
-                       label = "mikrotik:green:user";
+                       label = "green:user";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index ad9caa690e60ed2f3d366e7db851b03118bcf6ee..92b0beccd7c957be165e3e3da7d1bd7126cdb577 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -47,35 +47,35 @@
                pinctrl-0 = <&enable_gpio_11>;
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan2g_green {
-                       label = "netgear:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g_blue {
-                       label = "netgear:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wps_amber {
-                       label = "netgear:amber:wps";
+                       label = "amber:wps";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
index e3780632e9a38fa81048d32537e7ccc1b1f21bd2..0ca3b761bf1dd37d54b4918edfbbb0ee21cc7e82 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
@@ -2,7 +2,7 @@
 
 &leds {
        usb_green {
-               label = "netgear:green:usb";
+               label = "green:usb";
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
index 91c2971f8ca2a7c554ed62fe25411f074e2f721b..da6020769f189b5604ff06356accc6f0054ce93c 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
@@ -2,12 +2,12 @@
 
 &leds {
        wan_green {
-               label = "netgear:green:wan";
+               label = "green:wan";
                gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
        };
 
        wan_amber {
-               label = "netgear:amber:wan";
+               label = "amber:wan";
                gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
index 428f35cd2fc675282cd4b5086a5dab6d48b8d8fc..443f0c67248fca5fe333c500e4b1eb9ef2e1d85f 100644 (file)
--- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
+++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
@@ -24,19 +24,19 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "raccoon:green:power";
+                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "raccoon:yellow:wlan24";
+                       label = "yellow:wlan24";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_system: system {
-                       label = "raccoon:blue:sys";
+                       label = "blue:sys";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -45,7 +45,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "raccoon:red:wlan5";
+                       label = "red:wlan5";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index 5a1ac2102584ba9c4596fb5d374f947ac5b6f5ff..c5919b5ef83083fdfa5cb830e158316f417f7be1 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -35,35 +35,35 @@
                compatible = "gpio-leds";
 
                led_power_amber: power_amber {
-                       label = "pcs:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "pcs:green:power";
+                       label = "green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan_amber {
-                       label = "pcs:amber:wlan";
+                       label = "amber:wlan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan_green {
-                       label = "pcs:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan_amber {
-                       label = "pcs:amber:lan";
+                       label = "amber:lan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan_green {
-                       label = "pcs:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 9886c3dee5ff74dac5b5605bb5874cbf92c4c9dc..3ab1cb34b32e484043a63232b8e038bd63ce0c3d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -42,20 +42,20 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "pcs:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>,
                                <&gpio 4 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "pcs:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps_white {
-                       label = "pcs:white:wps";
+                       label = "white:wps";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_qihoo_c301.dts b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
index 9d1cd524405281b4d71a023b4e7176838f1fdada..dff2644b11aeefc50940d24f5561c769eb47091d 100644 (file)
--- a/target/linux/ath79/dts/ar9344_qihoo_c301.dts
+++ b/target/linux/ath79/dts/ar9344_qihoo_c301.dts
@@ -21,12 +21,12 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                led_wlan_g: wlan_g {
-                       label = "c301:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan_o: wlan_o {
-                       label = "c301:orange:wlan";
+                       label = "orange:wlan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
index 3ae68d6104cc7e8e150b76255beec07d318992c5..8a04af29737a8bfedd0bd696f55a420022c0e4a5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts
+++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
@@ -38,23 +38,23 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "wam250:white:lan";
+                       label = "white:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "wam250:white:power";
+                       label = "white:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                repeater {
-                       label = "wam250:white:repeater";
+                       label = "white:repeater";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "wam250:white:wlan";
+                       label = "white:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index 7a5bda64c5415212eec85de68f246a3f216123e4..f61f2bf6287179d01522964bbe22ac0be49635a4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -18,37 +18,37 @@
                compatible = "gpio-leds";
 
                signal0 {
-                       label = "rut955:green:signal0";
+                       label = "green:signal0";
                        gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
                };
 
                signal1 {
-                       label = "rut955:green:signal1";
+                       label = "green:signal1";
                        gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>;
                };
 
                signal2 {
-                       label = "rut955:green:signal2";
+                       label = "green:signal2";
                        gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>;
                };
 
                signal3 {
-                       label = "rut955:green:signal3";
+                       label = "green:signal3";
                        gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>;
                };
 
                signal4 {
-                       label = "rut955:green:signal4";
+                       label = "green:signal4";
                        gpios = <&gpio_ext 4 GPIO_ACTIVE_HIGH>;
                };
 
                led_system_red: system_red {
-                       label = "rut955:red:system";
+                       label = "red:system";
                        gpios = <&gpio_ext 5 GPIO_ACTIVE_HIGH>;
                };
 
                led_system_green: system_green {
-                       label = "rut955:green:system";
+                       label = "green:system";
                        gpios = <&gpio_ext 6 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index b158d8709aed487fed041188d393a00c8a27ada7..98ad19cdebd3ada23b3b4734e6a2dc76cf76fda4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -17,37 +17,37 @@
                compatible = "gpio-leds";
 
                signal0 {
-                       label = "rut955:green:signal0";
+                       label = "green:signal0";
                        gpios = <&gpio_ext 0 GPIO_ACTIVE_HIGH>;
                };
 
                signal1 {
-                       label = "rut955:green:signal1";
+                       label = "green:signal1";
                        gpios = <&gpio_ext 1 GPIO_ACTIVE_HIGH>;
                };
 
                signal2 {
-                       label = "rut955:green:signal2";
+                       label = "green:signal2";
                        gpios = <&gpio_ext 2 GPIO_ACTIVE_HIGH>;
                };
 
                signal3 {
-                       label = "rut955:green:signal3";
+                       label = "green:signal3";
                        gpios = <&gpio_ext 3 GPIO_ACTIVE_HIGH>;
                };
 
                signal4 {
-                       label = "rut955:green:signal4";
+                       label = "green:signal4";
                        gpios = <&gpio_ext 4 GPIO_ACTIVE_HIGH>;
                };
 
                led_system_red: system_red {
-                       label = "rut955:red:system";
+                       label = "red:system";
                        gpios = <&gpio_ext 5 GPIO_ACTIVE_HIGH>;
                };
 
                led_system_green: system_green {
-                       label = "rut955:green:system";
+                       label = "green:system";
                        gpios = <&gpio_ext 6 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
index 3b89b77412a90c3ba891f93e4c83fa8390bc4b84..c495eb298c8cfa172ae41d083148c6f1a9e2f419 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
@@ -16,12 +16,12 @@
                compatible = "gpio-leds";
 
                led_lan: lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
index 346c2aa19fd8b55224082bca11cb4f211aed454e..fa533d9f504a9c89c63d5feb4ba64e4bbb249cf0 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v2.dts
@@ -16,12 +16,12 @@
                compatible = "gpio-leds";
 
                led_lan: lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
index be29d944b2ca3e1feab5d19c90b809cccc2c73c8..a1dca810936f179d87e7267d43fb74f4af715527 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi
@@ -14,27 +14,27 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                link1 {
-                       label = "tp-link:green:link1";
+                       label = "green:link1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                link2 {
-                       label = "tp-link:green:link2";
+                       label = "green:link2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                link3 {
-                       label = "tp-link:green:link3";
+                       label = "green:link3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_system: link4 {
-                       label = "tp-link:green:link4";
+                       label = "green:link4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
index 089114f21b81f2dce72d9cb521912a2e279f5c5a..1fce8691602e21c6a8c92ef9f294defcdbb9616f 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi
@@ -14,32 +14,32 @@
                compatible = "gpio-leds";
 
                lan0 {
-                       label = "tp-link:green:lan0";
+                       label = "green:lan0";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                link1 {
-                       label = "tp-link:green:link1";
+                       label = "green:link1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                link2 {
-                       label = "tp-link:green:link2";
+                       label = "green:link2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                link3 {
-                       label = "tp-link:green:link3";
+                       label = "green:link3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_link4: link4 {
-                       label = "tp-link:green:link4";
+                       label = "green:link4";
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
index af992249f6bb7996e9339ea600c74e26e9b40c27..59a06346aeea3b3a90e3c10cc2627ff78a9c8a63 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -13,7 +13,7 @@
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "usbport";
                trigger-sources = <&hub_port>;

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index fd9f2b48ca1c0bc7ecb86417ca9215bd47665ff3..21fd079e1a06225d985f08de5853344bc908b740 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -38,14 +38,14 @@
 
 &leds {
        usb1 {
-               label = "tp-link:green:usb1";
+               label = "green:usb1";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port1>;
                linux,default-trigger = "usbport";
        };
 
        usb2 {
-               label = "tp-link:green:usb2";
+               label = "green:usb2";
                gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port2>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
index 68d79a6745f933032d0f982e18b2619d4fba9f80..e7430988addb71719f76011808febca30ece7f6b 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
@@ -17,19 +17,19 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -38,7 +38,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
index c0b0f0bd410ec72b0d0d47cb85a2cbdf5954fcfa..da3b0c63aa40d004088482ca26473613bc21c491 100644 (file)
--- a/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
+++ b/target/linux/ath79/dts/ar9344_ubnt_unifi-ap-pro.dts
@@ -21,12 +21,12 @@
                compatible = "gpio-leds";
 
                led_white: led-white {
-                       label = "ubnt:white:dome";
+                       label = "white:dome";
                        gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
                };
 
                led_blue: led-blue {
-                       label = "ubnt:blue:dome";
+                       label = "blue:dome";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
index 00ae776f04a05fd539b8f440b56fd15f7cc145e1..c440d7172115aaf358a8a02e0eef6990a1aa259f 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
@@ -24,22 +24,22 @@
                compatible = "gpio-leds";
 
                wifi {
-                       label = "mynet-n750:blue:wireless";
+                       label = "blue:wireless";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
                internet {
-                       label = "mynet-n750:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
                };
 
                wps {
-                       label = "mynet-n750:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                led_power: power {
-                       label = "mynet-n750:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
index 77e0a0b20fb759940684258a4650595170d72c4d..6bacee4b4df3dd4e9b4890b5975f5268260f77bd 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
@@ -24,34 +24,34 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "mynet-wifi-rangeextender:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        /* LED has no off state. It's either on or it blinks */
                };
 
                lan {
-                       label = "mynet-wifi-rangeextender:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
-                       label = "mynet-wifi-rangeextender:blue:wifi";
+                       label = "blue:wifi";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi-rssi-low {
-                       label = "mynet-wifi-rangeextender:blue:rssi-low";
+                       label = "blue:rssi-low";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                wifi-rssi-med {
-                       label = "mynet-wifi-rangeextender:blue:rssi-med";
+                       label = "blue:rssi-med";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                wifi-rssi-max {
-                       label = "mynet-wifi-rangeextender:blue:rssi-max";
+                       label = "blue:rssi-max";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index c897b23015bcc42f3d9a9c7d03d229fdf8aea06e..cd2e389ccd3fc3758f07461471cae4f828ed7f41 100644 (file)
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -38,20 +38,20 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "wb2000:green:2g";
+                       label = "green:2g";
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                usb {
-                       label = "wb2000:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
                        trigger-sources = <&hub_port1>, <&hub_port2>;
                        linux,default-trigger = "usbport";
                };
 
                led_system: system {
-                       label = "wb2000:green:system";
+                       label = "green:system";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
@@ -71,7 +71,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "wb2000:green:5g";
+                       label = "green:5g";
                        gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index 58780a04170418f00c65c795cc3d7910452b0270..fd587c5da0f48f0d66f052a602269b13ec545a1e 100644 (file)
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -48,18 +48,18 @@
                pinctrl-0 = <&enable_gpio20_gpio22>;
 
                wifi {
-                       label = "zbt-wd323:green:wifi";
+                       label = "green:wifi";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan1 {
-                       label = "zbt-wd323:orange:lan1";
+                       label = "orange:lan1";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "zbt-wd323:orange:lan2";
+                       label = "orange:lan2";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
index 8dd91ab38b0ac0a85b713fafe32b7c4526ec738d..40eabd0488ddf5fa0c094aef48d1b993659e49d2 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
@@ -52,29 +52,29 @@
                pinctrl-0 = <&enable_gpio4 &enable_gpio16>;
 
                lan1 {
-                       label = "n2q:orange:lan1";
+                       label = "orange:lan1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "n2q:orange:lan2";
+                       label = "orange:lan2";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_usb: usb {
-                       label = "n2q:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port0>;
                };
 
                minipcie {
-                       label = "n2q:green:minipcie";
+                       label = "green:minipcie";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "n2q:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -84,22 +84,22 @@
                compatible = "gpio-leds";
 
                poe-passthrough {
-                       label = "n2q:green:poe-passthrough";
+                       label = "green:poe-passthrough";
                        gpios = <&pcf8574 1 GPIO_ACTIVE_LOW>;
                };
 
                signal1 {
-                       label = "n2q:red:signal1";
+                       label = "red:signal1";
                        gpios = <&pcf8574 3 GPIO_ACTIVE_LOW>;
                };
 
                signal2 {
-                       label = "n2q:orange:signal2";
+                       label = "orange:signal2";
                        gpios = <&pcf8574 4 GPIO_ACTIVE_LOW>;
                };
 
                signal3 {
-                       label = "n2q:green:signal3";
+                       label = "green:signal3";
                        gpios = <&pcf8574 5 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
index 0405e40839624ba26b29bf722d9dc90d4c40dcdf..2588b10d739290a4c07e732180e5568c5e0cd056 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
@@ -20,29 +20,29 @@
                pinctrl-0 = <&enable_gpio4 &enable_gpio16>;
 
                lan {
-                       label = "r36a:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                led_status: status {
-                       label = "r36a:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "r36a:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wan {
-                       label = "r36a:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "r36a:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 ac1df6bf688311a1183160ef764d45934ec9d45b..749acedcdae502e56650a35dd9dc988e9cd3f122 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,38 +23,38 @@
                pinctrl-names = "default";
 
                wlan {
-                       label = "cf-e130n-v2:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "cf-e130n-v2:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                unused {
-                       label = "cf-e130n-v2:green:unused";
+                       label = "green:unused";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-e130n-v2:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e130n-v2:red:rssimediumlow";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e130n-v2:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "cf-e130n-v2:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
index a7c2571fda3af1bcc93b225f1049124e16ab0f23..7e2ff5d0ee3088f45638f7283717284b09bbf109 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
@@ -22,38 +22,38 @@
                pinctrl-names = "default";
 
                wlan {
-                       label = "cf-e313ac:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "cf-e313ac:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "cf-e313ac:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-e313ac:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e313ac:red:rssimediumlow";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e313ac:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "cf-e313ac:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 16 GPIO_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 ff975567d1928acfa333dad694e4a6e26348984b..723c9eda13f6f622f90c0d21d804860902a692df 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
@@ -23,37 +23,37 @@
                pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
                wan {
-                       label = "cf-e314n-v2:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e314n-v2:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-e314n-v2:red:signal1";
+                       label = "red:signal1";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e314n-v2:red:signal2";
+                       label = "red:signal2";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e314n-v2:green:signal3";
+                       label = "green:signal3";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "cf-e314n-v2:green:signal4";
+                       label = "green:signal4";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e314n-v2:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index d5711334fd0ed6537e0bc94025fd0c7a0f9edaaa..5c69a9bde0089a2eb292513d01fdecbea97f0673 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -29,33 +29,33 @@
                pinctrl-0 = <&jtag_disable_pins &led_wan_pin>;
 
                wan {
-                       label = "cf-e5:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e5:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e5:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssi0 {
-                       label = "cf-e5:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "cf-e5:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "cf-e5:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 847dae6895298586f4d94af8e4baca15f982b747..46b08da838c7976acb6ed5eb3eb0b5a33198729f 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -35,37 +35,37 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                lan1 {
-                       label = "cf-e560ac:blue:lan1";
+                       label = "blue:lan1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "cf-e560ac:blue:lan2";
+                       label = "blue:lan2";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "cf-e560ac:blue:lan3";
+                       label = "blue:lan3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "cf-e560ac:blue:lan4";
+                       label = "blue:lan4";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                led_system: system {
-                       label = "cf-e560ac:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "cf-e560ac:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-e560ac:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index ad5275c0a17eb112c95cdd1a93370a61ce54fee8..f52467c4e2e4540f0caadc3febff15fba1a6fe06 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -23,17 +23,17 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                lan {
-                       label = "cf-ew72:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                led_wan: wan {
-                       label = "cf-ew72:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "cf-ew72:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index 467dfaeb152319d7e4f219929b3d0cb3eaa9be11..2fbdc8fd077d2132c6b744ba526b184eb7083aa8 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -23,17 +23,17 @@
                pinctrl-0 = <&jtag_disable_pins &pinmux_led_rssihigh &pinmux_led_rssilow>;
 
                led_lan: lan {
-                       label = "cf-wr752ac-v1:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssihigh {
-                       label = "cf-wr752ac-v1:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-wr752ac-v1:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
index 4b4e23e1aa4c8e0deab46db5fcf210cac934d549..2cc9d46fac53605ae7ded1482e95d1d86d70af67 100644 (file)
--- a/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
+++ b/target/linux/ath79/dts/qca9531_compex_wpj531-16m.dts
@@ -39,22 +39,22 @@
                pinctrl-0 = <&pinmux_led_eth_pins>;
 
                sig1 {
-                       label = "wpj531:red:sig1";
+                       label = "red:sig1";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                sig2 {
-                       label = "wpj531:yellow:sig2";
+                       label = "yellow:sig2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                sig3 {
-                       label = "wpj531:green:sig3";
+                       label = "green:sig3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_sig4: sig4 {
-                       label = "wpj531:green:sig4";
+                       label = "green:sig4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
index b3fc8ea0bfd73f62257060560cb336b59ea8b849..dafce16a2ac85c8f4ad8f936813ddcf42256bf6d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
+++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
@@ -42,14 +42,14 @@
                compatible = "gpio-export";
 
                usb_power {
-                       label = "d-link:power:usb";
+                       label = "power:usb";
                        gpio-export,name = "d-link:power:usb";
                        gpio-export,output = <0>;
                        gpios = <&gpio_ext 3 GPIO_ACTIVE_LOW>;
                };
 
                zwave_power {
-                       label = "d-link:power:zwave";
+                       label = "power:zwave";
                        gpio-export,name = "d-link:power:zwave";
                        gpio-export,output = <0>;
                        gpios = <&gpio_ext 1 GPIO_ACTIVE_LOW>;
@@ -76,12 +76,12 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                status {
-                       label = "d-link:red:status";
+                       label = "red:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 5ca651cfc4152b198443d838d43ad12e0fb1e898..eb91d7e0b4df6268ba82687573f052180ac0706a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -33,29 +33,29 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "ews511ap:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                lan1 {
-                       label = "ews511ap:blue:lan1";
+                       label = "blue:lan1";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "ews511ap:blue:lan2";
+                       label = "blue:lan2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "ews511ap:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "ews511ap:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
index 5a92d83669ed05316972817a440fe1cf49b32fa3..cf531ed8c4102a07ace2528c5935a679afe2d8fb 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
@@ -21,13 +21,9 @@
 };
 
 &led_status {
-       label = "gl-ar300m-lite:red:status";
-};
-
-&led_lan {
-       label = "gl-ar300m-lite:green:lan";
+       label = "red:status";
 };
 
 &led_wlan {
-       label = "gl-ar300m-lite:green:wlan";
+       label = "green:wlan";
 };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index 617076b0746b9885457a8b35ae5d249f052ccc51..86c895fc6a2c8040e21016179dd51171e70d467e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -43,17 +43,17 @@
                // Colors for non-Lite versions
 
                led_status: status {
-                       label = "gl-ar300m:green:status";
+                       label = "green:status";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
-               led_lan: lan {
-                       label = "gl-ar300m:green:lan";
+               lan {
+                       label = "green:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_wlan: wlan {
-                       label = "gl-ar300m:red:wlan";
+                       label = "red:wlan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 1bc41839d188f3dac49f923ca7ae31678cf7a36c..57a7ed1a0c71a87272d0146ace045474e7cd1b47 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -40,19 +40,19 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "gl-ar750:white:power";
+                       label = "white:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "gl-ar750:white:wlan2g";
+                       label = "white:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "gl-ar750:white:wlan5g";
+                       label = "white:wlan5g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index f423e709f997d47ad766b571e4e5a84f33e8515b..acb458f7ecc358be06542ebf25744c0ec1725622 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -26,30 +26,30 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "gl-x750:green:power";
+                       label = "green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "gl-x750:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "gl-x750:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan {
-                       label = "gl-x750:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                4g {
-                       label = "gl-x750:green:4g";
+                       label = "green:4g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_telco_t1.dts b/target/linux/ath79/dts/qca9531_telco_t1.dts
index 98b52a7b244c27ce1dfec06244740748d43f0b7d..455bfb336fe2591fed97ff704b7b7e9ecc685203 100644 (file)
--- a/target/linux/ath79/dts/qca9531_telco_t1.dts
+++ b/target/linux/ath79/dts/qca9531_telco_t1.dts
@@ -33,33 +33,33 @@
                pinctrl-0 = <&jtag_disable_pins &pinmux_led_wan_pin>;
 
                wan {
-                       label = "t1:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "t1:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "t1:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_rssi0: rssi0 {
-                       label = "t1:blue:rssi0";
+                       label = "blue:rssi0";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssi1 {
-                       label = "t1:blue:rssi1";
+                       label = "blue:rssi1";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "t1:blue:rssi2";
+                       label = "blue:rssi2";
                        gpios = <&gpio 15 GPIO_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 65b85a78f109af37bc6a82dc4ca8b3963d5c5105..f6bd7ad58f946407ab3042664e95276b948613fa 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,46 +21,46 @@
                compatible = "gpio-leds";
 
                wlan2g {
-                       label = "tp-link:white:wlan2g";
+                       label = "white:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
-                       label = "tp-link:white:wlan5g";
+                       label = "white:wlan5g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                qss {
-                       label = "tp-link:white:qss";
+                       label = "white:qss";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:white:wan";
+                       label = "white:wan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:white:lan";
+                       label = "white:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "tp-link:white:usb";
+                       label = "white:usb";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                internet {
-                       label = "tp-link:white:internet";
+                       label = "white:internet";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_system: system {
-                       label = "tp-link:white:system";
+                       label = "white:system";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index 92da0b1a5e04c9d768257964b4535a271c05e1a2..2f6c4147c9a1432c3e9bd9085e4154cd8da02538 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -58,56 +58,56 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index 6ab63ebde0d55258db63d33c95180f04f749f3bf..bd3858e59a00eec2217dc260dafc2a6f7af690a9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -22,38 +22,38 @@
 
                /* D12 */
                wan {
-                       label = "tp-link:white:wan";
+                       label = "white:wan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
                /* D11 */
                4g {
-                       label = "tp-link:white:4g";
+                       label = "white:4g";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                /* D5 */
                wps {
-                       label = "tp-link:white:wps";
+                       label = "white:wps";
                        gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
                };
 
                /* D3 */
                wlan {
-                       label = "tp-link:white:wlan";
+                       label = "white:wlan";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                /* D2 */
                led_power: power {
-                       label = "tp-link:white:power";
+                       label = "white:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                /* D4 */
                lan {
-                       label = "tp-link:white:lan";
+                       label = "white:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index e6fc128229ee9843747b212af64f78d44d892a35..a162d9030f65f0f4c6897d8ca0e9d3d3898b32d2 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -21,36 +21,36 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                internet {
-                       label = "tp-link:green:internet";
+                       label = "green:internet";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_wallys_dr531.dts b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
index a31e24b7ccabb6af814fe7663d09026b661d102f..777a55b6f3c65e925363bf82a9bb5e1b3fb1138d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_wallys_dr531.dts
+++ b/target/linux/ath79/dts/qca9531_wallys_dr531.dts
@@ -41,32 +41,32 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "dr531:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_sig4: sig4 {
-                       label = "dr531:green:sig4";
+                       label = "green:sig4";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                sig1 {
-                       label = "dr531:green:sig1";
+                       label = "green:sig1";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                sig2 {
-                       label = "dr531:green:sig2";
+                       label = "green:sig2";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                sig3 {
-                       label = "dr531:green:sig3";
+                       label = "green:sig3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "dr531:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9531_yuncore_a770.dts b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
index 4a0fa494743e00420d2977f6f7cd2b2e64814328..aaa9e1f908ef7a6430787303f0d10ac5146a693b 100644 (file)
--- a/target/linux/ath79/dts/qca9531_yuncore_a770.dts
+++ b/target/linux/ath79/dts/qca9531_yuncore_a770.dts
@@ -31,23 +31,23 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "a770:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                led_status: status {
-                       label = "a770:green:status";
+                       label = "green:status";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wan {
-                       label = "a770:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "a770:red:wlan2g";
+                       label = "red:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
index 7643717c0e0f18c0c54ec69552dbd1783e5fb9bf..961caa8ade5f8664f19897b2c9f40b367fb17c1c 100644 (file)
--- a/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
+++ b/target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
@@ -23,32 +23,32 @@
                pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
                wan {
-                       label = "cf-e110n-v2:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "cf-e110n-v2:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "cf-e110n-v2:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "cf-e110n-v2:red:rssimediumlow";
+                       label = "red:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "cf-e110n-v2:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_rssihigh: rssihigh {
-                       label = "cf-e110n-v2:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,7 +57,7 @@
                compatible = "gpio-leds";
 
                wlan {
-                       label = "cf-e110n-v2:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
index 9b3a66f7034c6bf088f323effba35a3a915f1c9a..50020799408f053e2659ace8f44dc06b33fceeb8 100644 (file)
--- a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
@@ -33,32 +33,32 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                led_status: status {
-                       label = "d-link:red:status";
+                       label = "red:status";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "d-link:red:rssilow";
+                       label = "red:rssilow";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "d-link:green:rssimediumlow";
+                       label = "green:rssimediumlow";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "d-link:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                rssihigh {
-                       label = "d-link:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
index f54e757c62732b0c24c19539f944181a29b6985d..5448b7beb0e7fc8d191f6aa2df6be8f824b9c0bc 100644 (file)
--- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
+++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi
@@ -20,39 +20,39 @@
                pinctrl-0 = <&led_wan_pin>;
 
                power {
-                       label = "mikrotik:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                led_user: user {
-                       label = "mikrotik:green:user";
+                       label = "green:user";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "mikrotik:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "mikrotik:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                rssilow {
-                       label = "mikrotik:green:rssilow";
+                       label = "green:rssilow";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "mikrotik:green:rssimediumlow";
+                       label = "green:rssimediumlow";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "mikrotik:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
@@ -60,7 +60,7 @@
                unregistered here to avoid conflict.
 
                rssihigh {
-                       label = "mikrotik:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
                */

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
index 5edd2adc835f2cb9db87582de8464f4d95e00732..3295776bf93e48efbc906d68f4a2f06bea687844 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
@@ -4,7 +4,7 @@
 
 &leds {
        lan {
-               label = "tp-link:green:lan";
+               label = "green:lan";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
index 2722c59b0eb1221db09e735f741931855a854f06..1d8098944a1af8bbf34a1e69bd87fd4ca31e6a78 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_cpe220-v3.dts
@@ -9,12 +9,12 @@
 
 &leds {
        lan0 {
-               label = "tp-link:green:lan0";
+               label = "green:lan0";
                gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
        };
 
        lan1 {
-               label = "tp-link:green:lan1";
+               label = "green:lan1";
                gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
index 387bd6ba1df58c1cbfb53c424fda743185e1600b..7c64dcc24fb7fd4fc9b1879bb211387a1e92799c 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_cpexxx.dtsi
@@ -18,22 +18,22 @@
                compatible = "gpio-leds";
 
                link1 {
-                       label = "tp-link:green:link1";
+                       label = "green:link1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                link2 {
-                       label = "tp-link:green:link2";
+                       label = "green:link2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                link3 {
-                       label = "tp-link:green:link3";
+                       label = "green:link3";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                led_link4: link4 {
-                       label = "tp-link:green:link4";
+                       label = "green:link4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
index efe892e2880c16577f574d345a0d464dccae4781..c45280aff07d311f49d75e034696865dc9003572 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa801nd.dtsi
@@ -18,28 +18,28 @@
                compatible = "gpio-leds";
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                security_red {
-                       label = "tp-link:red:security";
+                       label = "red:security";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                security_green {
-                       label = "tp-link:green:security";
+                       label = "green:security";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
index 537c577918889a0446ac69cb8afc5fd264866806..7d8519ef9be1d637e450496b8033e70fc02fe9d3 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wa850re-v2.dts
@@ -24,42 +24,42 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                lan {
-                       label = "tp-link:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_re: re {
-                       label = "tp-link:blue:re";
+                       label = "blue:re";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                signal1 {
-                       label = "tp-link:blue:signal1";
+                       label = "blue:signal1";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                signal2 {
-                       label = "tp-link:blue:signal2";
+                       label = "blue:signal2";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                signal3 {
-                       label = "tp-link:blue:signal3";
+                       label = "blue:signal3";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                signal4 {
-                       label = "tp-link:blue:signal4";
+                       label = "blue:signal4";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led_signal5: signal5 {
-                       label = "tp-link:blue:signal5";
+                       label = "blue:signal5";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index 8bb708c6b6ec513a744e5c71eaa3ff2ef89f7352..b6349e537183ecbd4063606e5d1ced09e3ef9404 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -18,7 +18,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
index a0d0afcccfe007c757c3f18e0ebf5836394ee7c0..027ed82cbe16b60813103990e1d289268824e683 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
@@ -13,12 +13,12 @@
 
 &leds {
        led_system: system {
-               label = "tp-link:green:system";
+               label = "green:system";
                gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
        };
 
        wan_orange {
-               label = "tp-link:orange:wan";
+               label = "orange:wan";
                gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index e85f37f4250e2f3cba4c2fd8c159a23121c45992..b68cd87e98ebfc11ade7b7dd3270e621c990dc20 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -14,38 +14,38 @@
                compatible = "gpio-leds";
 
                wifi {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_qss: qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index 25447b8bffcad395c44b2ba84f8fc3e26d957336..269ca0364541de774e0e7de3b297ac6dc60a6bea 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -21,54 +21,54 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wifi {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan_green {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                wan_red {
-                       label = "tp-link:red:wan";
+                       label = "red:wan";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port>;

diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index 6c1d583f01920d8fa6ae9f9b18d79fda38201716..091d6696a38ce27560296767e1b092909e45ba8b 100644 (file)
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -18,7 +18,7 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts b/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
index 43bf582b5a0234d0372cb3a46ea651f9ad9769d7..bdb983cd7c73ea545af96751ba6cdd74de6b7022 100644 (file)
--- a/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritz1750e.dts
@@ -45,43 +45,43 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "fritz1750e:green:power";
+                       label = "green:power";
                        gpios = <&spi_gpio 6 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "fritz1750e:green:wlan";
+                       label = "green:wlan";
                        gpios = <&spi_gpio 5 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy1tpt";
                };
 
                lan {
-                       label = "fritz1750e:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                rssi0 {
-                       label = "fritz1750e:green:rssi0";
+                       label = "green:rssi0";
                        gpios = <&spi_gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
                rssi1 {
-                       label = "fritz1750e:green:rssi1";
+                       label = "green:rssi1";
                        gpios = <&spi_gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
                rssi2 {
-                       label = "fritz1750e:green:rssi2";
+                       label = "green:rssi2";
                        gpios = <&spi_gpio 2 GPIO_ACTIVE_HIGH>;
                };
 
                rssi3 {
-                       label = "fritz1750e:green:rssi3";
+                       label = "green:rssi3";
                        gpios = <&spi_gpio 3 GPIO_ACTIVE_HIGH>;
                };
 
                rssi4 {
-                       label = "fritz1750e:green:rssi4";
+                       label = "green:rssi4";
                        gpios = <&spi_gpio 4 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
index 86cd7153e398922002d639acdb29473d8af17a80..0d3053597656830905d1f4a5b4be1860b2475757 100644 (file)
--- a/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritz450e.dts
@@ -19,33 +19,33 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "fritz450e:green:power";
+                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 
                wlan {
-                       label = "fritz450e:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "fritz450e:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                rssi2 {
-                       label = "fritz450e:green:rssi2";
+                       label = "green:rssi2";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                rssi3 {
-                       label = "fritz450e:green:rssi3";
+                       label = "green:rssi3";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                rssi4 {
-                       label = "fritz450e:green:rssi4";
+                       label = "green:rssi4";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
index 28b19f92ef793afb5e6341b90c051bf9cee68646..bf1c026d173b7a3b96a8315f92c66fa80632c151 100644 (file)
--- a/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
+++ b/target/linux/ath79/dts/qca9556_avm_fritzdvbc.dts
@@ -48,43 +48,43 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "fritzdvbc:green:power";
+                       label = "green:power";
                        gpios = <&spi_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "fritzdvbc:green:wlan";
+                       label = "green:wlan";
                        gpios = <&spi_gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                tv {
-                       label = "fritzdvbc:green:tv";
+                       label = "green:tv";
                        gpios = <&spi_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                rssihigh {
-                       label = "fritzdvbc:green:rssihigh";
+                       label = "green:rssihigh";
                        gpios = <&spi_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumhigh {
-                       label = "fritzdvbc:green:rssimediumhigh";
+                       label = "green:rssimediumhigh";
                        gpios = <&spi_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                rssimedium {
-                       label = "fritzdvbc:green:rssimedium";
+                       label = "green:rssimedium";
                        gpios = <&spi_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                rssimediumlow {
-                       label = "fritzdvbc:green:rssimediumlow";
+                       label = "green:rssimediumlow";
                        gpios = <&spi_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                rssilow {
-                       label = "fritzdvbc:green:rssilow";
+                       label = "green:rssilow";
                        gpios = <&spi_gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index d629c751de9c001ef1aea09db1f203aca2847f12..33053771ad7318cebf21e739aee615af3fab47c2 100644 (file)
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -20,23 +20,23 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "bhr-4grv2:green:power";
+                       label = "green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                diag {
-                       label = "bhr-4grv2:orange:diag";
+                       label = "orange:diag";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                vpn_orange {
-                       label = "bhr-4grv2:orange:vpn";
+                       label = "orange:vpn";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                vpn_green {
-                       label = "bhr-4grv2:green:vpn";
+                       label = "green:vpn";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
index d4aa0d742ad2d9b67d8c3e33bd85761512c372f0..f19e186796ddf34cea22afae479f16ec5f33aeea 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
@@ -17,30 +17,30 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "iodata:green:power";
+                       label = "green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                eco {
-                       label = "iodata:green:eco";
+                       label = "green:eco";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "iodata:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan2g {
-                       label = "iodata:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                notification {
-                       label = "iodata:amber:notification";
+                       label = "amber:notification";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
index e259cb0266326759c04b83077342cd1d8608c3aa..9a938aff30dd34d9862cac9b03238df559ac90dc 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1167dgr.dts
@@ -9,7 +9,7 @@
 
 &leds {
        copy {
-               label = "iodata:green:copy";
+               label = "green:copy";
                gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
index 20546433028ecdd2d6404ca8027d34253e39a47f..1e7d92db3fe22c0650d4fa2fa4165053d2a2be36 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr.dts
@@ -9,7 +9,7 @@
 
 &leds {
        function {
-               label = "iodata:green:function";
+               label = "green:function";
                gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
index 388bd3ef091a3035204ae94c1ca54e4727c46cf3..af2607d7b7c9e719ad014dbaec1199beb1a76192 100644 (file)
--- a/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
+++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac1600dgr2.dts
@@ -9,7 +9,7 @@
 
 &leds {
        copy {
-               label = "iodata:green:copy";
+               label = "green:copy";
                gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
index 5898518f20f5e2b211b642fd42fb39f7c41fb3cc..d56fab120bf52e5d51f7563df8b47cc1413ebdad 100644 (file)
--- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
+++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
@@ -17,38 +17,38 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "nbg6616:green:power";
+                       label = "green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                usb1 {
-                       label = "nbg6616:green:usb1";
+                       label = "green:usb1";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port0>;
                };
 
                usb2 {
-                       label = "nbg6616:green:usb2";
+                       label = "green:usb2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port1>;
                };
 
                wifi2g {
-                       label = "nbg6616:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5g {
-                       label = "nbg6616:green:wifi5g";
+                       label = "green:wifi5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "nbg6616:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 0 GPIO_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 d825eb005b3646341fe81a22913c78e2ef9ca3bb..1cca39de38093c745273134d7763651cb7503e34 100644 (file)
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -31,25 +31,25 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "all-wap02860ac:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "all-wap02860ac:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "all-wap02860ac:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "all-wap02860ac:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
index d04f61193a2709eb72f8869ea41ced6dc223514b..240d20ff1f96b7b0dd4200e79fdba28078a200a7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v1.dts
@@ -5,32 +5,6 @@
 / {
        compatible = "comfast,cf-wr650ac-v1", "qca,qca9558";
        model = "Comfast CF-WR650AC v1";
-
-       leds {
-               compatible = "gpio-leds";
-
-               wps {
-                       label = "cf-wr650ac-v1:blue:wps";
-                       gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-               };
-
-               network {
-                       label = "cf-wr650ac-v1:blue:network";
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan2g {
-                       label = "cf-wr650ac-v1:blue:wlan2";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
-               wlan5g {
-                       label = "cf-wr650ac-v1:blue:wlan5";
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
index 6edd75d61acbeaddea0357fed511da6992cc1326..1b20c3b615976fbe5d56e20d9a3f4edb151d6b1d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac-v2.dts
@@ -5,32 +5,6 @@
 / {
        compatible = "comfast,cf-wr650ac-v2", "qca,qca9558";
        model = "Comfast CF-WR650AC v2";
-
-       leds {
-               compatible = "gpio-leds";
-
-               wps {
-                       label = "cf-wr650ac-v2:blue:wps";
-                       gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-               };
-
-               network {
-                       label = "cf-wr650ac-v2:blue:network";
-                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan2g {
-                       label = "cf-wr650ac-v2:blue:wlan2";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
-               wlan5g {
-                       label = "cf-wr650ac-v2:blue:wlan5";
-                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index b57bcc3942d13426b8d370d7a37037c9515a7767..5d325512748dfd395ee12b79ab96896b08eb87a6 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -17,6 +17,32 @@
                };
        };
 
+       leds {
+               compatible = "gpio-leds";
+
+               wps {
+                       label = "blue:wps";
+                       gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+               };
+
+               network {
+                       label = "blue:network";
+                       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>;
+                       linux,default-trigger = "phy0tpt";
+               };
+       };
+
        watchdog {
                compatible = "linux,wdt-gpio";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index 3164d783fff715f9e91d0ec11f035058f2a1f899..6efdfcab3c553a6ce57d06548675103454c59797 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "dvl1200e:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_status_red: status_red {
-                       label = "dvl1200e:red:status";
+                       label = "red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
index 11ac6fd18f56cf96b7b576940ed8ab9b405b8cca..4ef43be4ba154b22dfee1d40ce8c72a024c6d9a0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "dvl1200i:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_status_red: status_red {
-                       label = "dvl1200i:red:status";
+                       label = "red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
index 11325a69c80c008bf5862d7e2d04811f7faedbf2..1cf5c09d72fcc9d147bc6902064168f587763d8a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "dvl1750c:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_status_red: status_red {
-                       label = "dvl1750c:red:status";
+                       label = "red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 7de8ee0bdbf5088752a11d0f292113fc6d79dab3..6a6228327f227bed26dd5ebceb1439e50b47a2c4 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -34,13 +34,13 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "dvl1750e:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_status_red: status_red {
-                       label = "dvl1750e:red:status";
+                       label = "red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
index 7ba011faf2db99805355de12d3a6531ca2fd2454..59a9f4c5235a555a56fa92d08fd1704ca89a1f87 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_status_blue: status_blue {
-                       label = "dvl1750i:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_status_red: status_red {
-                       label = "dvl1750i:red:status";
+                       label = "red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
index a113097f628a34342ed3291eafdc2c16a5942dd4..8352b37f4a9d8962fb4c0e178f43d087dd766d96 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
@@ -18,12 +18,12 @@
 
                led_status_red: status_red {
                        /* This LED is not visible on the external casing. */
-                       label = "dvl1750x:red:status";
+                       label = "red:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "dvl1750x:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 2cd05d9159ad4537ea0792be54e03046d13f7f78..f0cf22511a367ba9a34caf8a7d588ebf9ed9de62 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2695-a1.dts
@@ -20,18 +20,18 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "d-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_red: power_red {
-                       label = "d-link:red:power";
+                       label = "red:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wifi2g {
-                       label = "d-link:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 776e92ceece2fdbacb7419bf652be947f863ff12..4af1860acab7c75aba776250e922d8cc139397be 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -20,32 +20,32 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "dw33d:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                mmc {
-                       label = "dw33d:blue:mmc";
+                       label = "blue:mmc";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                usb {
-                       label = "dw33d:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
 
                wlan2g {
-                       label = "dw33d:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                internet {
-                       label = "dw33d:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
index e4e3ca3409f745983ec2c4468be75580c8c967c0..5e38f2e4594d5c631b38140ef5774f635d8b2cb6 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
@@ -20,25 +20,25 @@
                compatible = "gpio-leds";
 
                led_power_orange: power_orange {
-                       label = "ecb1750:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "ecb1750:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "ecb1750:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "ecb1750:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
index aa14fd4f3fff0adc6921f59f34576b6bd0e3d1d6..9d37664306b440f0359a98bfd68d36af07ccd850 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
@@ -20,30 +20,30 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "epg5000:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "epg5000:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "epg5000:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps_amber {
-                       label = "epg5000:amber:wps";
+                       label = "amber:wps";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                wps_blue {
-                       label = "epg5000:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index ccead91cfceb3c7e129cd055d33823b0326c94df..c4a73f25638d972bccfa701b7c3c935aa5670cca 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -20,19 +20,19 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "librerouter-v1:green:system";
+                       label = "green:system";
                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                wifi_green {
-                       label = "librerouter-v1:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                status_blue {
-                       label = "librerouter-v1:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
index 222de88784629362eb4183eab2ff6d558454b873..d1f307bd481352cae9c0ac837c8b807c46a1daaf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-921gs-5hpacd-15s.dts
@@ -10,7 +10,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "mikrotik:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath10k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
index 3936fd993e249ecda935f4329c147096dff8fe5c..34cc35735f2433c499bf17e3ebc02784618addb7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
@@ -10,7 +10,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "mikrotik:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath10k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
index 57aeedd6770d3b9f36105566a4a09d04ac62c60a..70b3ee68c3883758435f1844676952f2bcd0d535 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
@@ -17,7 +17,7 @@
                compatible = "gpio-leds";
 
                led_user: user {
-                       label = "mikrotik:green:user";
+                       label = "green:user";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index bbecdfce834ddaf4a3a3a90d49eef5bd7eb6ac70..04abb8717ec2fe2bee045d6f1f181cce9e4c7a1e 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -44,47 +44,47 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                left_blue {
-                       label = "netgear:blue:left";
+                       label = "blue:left";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                right_blue {
-                       label = "netgear:blue:right";
+                       label = "blue:right";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                client_red {
-                       label = "netgear:red:client";
+                       label = "red:client";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                client_green {
-                       label = "netgear:green:client";
+                       label = "green:client";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                router_red {
-                       label = "netgear:red:router";
+                       label = "red:router";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                router_green {
-                       label = "netgear:green:router";
+                       label = "green:router";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
index eefa839b886de98ef3cee4f87ec12b37f4cb7c30..dbefa40dcf32a9cb70f2414636cc77f5284a63f8 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -21,25 +21,25 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "koala:green:power";
+                       label = "green:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wifi2 {
-                       label = "koala:yellow:wlan2";
+                       label = "yellow:wlan2";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5 {
-                       label = "koala:red:wlan58";
+                       label = "red:wlan58";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led_system: system {
-                       label = "koala:blue:sys";
+                       label = "blue:sys";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
index eb93201ab004c9bd073f3475184101b80d25e579..8c7a7af91bd14183d3e9b6e0d7f6c0fa4afa7c17 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -13,13 +13,13 @@
                compatible = "gpio-leds";
 
                wifi2 {
-                       label = "ursus:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5 {
-                       label = "ursus:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 51a22f09a2d0d527d119d31f196fffbe14541563..eb196eb2e5c3c0d41b8de9b4852139f959529ed0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -20,22 +20,22 @@
                compatible = "gpio-leds";
 
                power {
-                       label = "om5pac:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wifi_green {
-                       label = "om5pac:green:wifi";
+                       label = "green:wifi";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                wifi_yellow {
-                       label = "om5pac:yellow:wifi";
+                       label = "yellow:wifi";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wifi_red {
-                       label = "om5pac:red:wifi";
+                       label = "red:wifi";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
index 0b191149cd888bec377f3161d8afa8d8ea894974..412a6e7b334c1c2c6e7bbdb772bdcd09121dfcc6 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
+++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
@@ -36,24 +36,24 @@
                compatible = "gpio-leds";
 
                led_status_amber: status_amber {
-                       label = "wlr-8100:amber:status";
+                       label = "amber:status";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                ops {
-                       label = "wlr-8100:white:ops";
+                       label = "white:ops";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                wifi2g {
-                       label = "wlr-8100:blue:wifi2g";
+                       label = "blue:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5g {
-                       label = "wlr-8100:blue:wifi5g";
+                       label = "blue:wifi5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
index 83458df56d87483e493b050ee1eb6fc65d733980..d59d87b5e61925ae884dc1b61894e2e7d95680a5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
@@ -18,33 +18,33 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                usb1 {
-                       label = "tp-link:green:usb1";
+                       label = "green:usb1";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
 
                usb2 {
-                       label = "tp-link:green:usb2";
+                       label = "green:usb2";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
index c8381296c1eee5d3c0d1565fbe0574c65cf40332..9ffbce0a212cb623f5794be1817238ae3d0d29c1 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
@@ -18,7 +18,7 @@
 
 &leds {
        wlan5g {
-               label = "tp-link:green:wlan5g";
+               label = "green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "phy0tpt";
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
index ee35fa659942066b0753bc73eb02a3b0d14fa38c..e2d1d63813fba84c24ba378dd5563907243d7595 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
@@ -18,7 +18,7 @@
 
 &leds {
        wlan5g {
-               label = "tp-link:green:wlan5g";
+               label = "green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "phy0tpt";
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
index 634c23c35625429558b6456987d83c1ee336ca1d..be99b8e3e4f876c9e252c85784a3a5b5e3b432a1 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
@@ -18,7 +18,7 @@
 
 &leds {
        wlan5g {
-               label = "tp-link:green:wlan5g";
+               label = "green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "phy0tpt";
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
index 6d7e0dd5e64104b89ff3f9f5213a4363672d509a..598c5570aa916b367d2c8e5b9d8c5cbc87da9a5d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
@@ -17,30 +17,30 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:white:system";
+                       label = "white:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "tp-link:white:wlan";
+                       label = "white:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:white:lan";
+                       label = "white:lan";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "tp-link:white:usb";
+                       label = "white:usb";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port1>, <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                qss {
-                       label = "tp-link:white:qss";
+                       label = "white:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 3e57326e0bf4e10cb891e8b3f74d4ed2984bc4e4..11ebbdaceaccae572dc0fb51ce1cd2c4fe491508 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -46,30 +46,30 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g_green {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan2g_red {
-                       label = "tp-link:red:wlan2g";
+                       label = "red:wlan2g";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g_green {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g_red {
-                       label = "tp-link:red:wlan5g";
+                       label = "red:wlan5g";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 0c11d786c9f2b5e44c06b7100305f17a6c90f475..55f4edf19e857761a8d1f7933ed09c3ea2fe92ba 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -19,39 +19,39 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "tp-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan_link {
-                       label = "tp-link:green:lan_link";
+                       label = "green:lan_link";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
 
                lan_data {
-                       label = "tp-link:green:lan_data";
+                       label = "green:lan_data";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wps_blue {
-                       label = "tp-link:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
                };
 
                wps_red {
-                       label = "tp-link:red:wps";
+                       label = "red:wps";
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index 70e14c4ebe9c70017e8279f949ad95aabb972219..9f241ebc2fb2de2bd4992d63034e379809d1003c 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -21,33 +21,33 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                usb1 {
-                       label = "tp-link:green:usb1";
+                       label = "green:usb1";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
 
                usb2 {
-                       label = "tp-link:green:usb2";
+                       label = "green:usb2";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wlan2g {
-                       label = "tp-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:blue:qss";
+                       label = "blue:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -56,7 +56,7 @@
                compatible = "gpio-leds";
 
                wlan5g {
-                       label = "tp-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 6173a5ca75d37ebc9c863a5fbad6bfff961fed57..476162a00e944bcdcf66ccc7eb4869eb624bfc93 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -18,26 +18,26 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
                };
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wifi_green {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi_wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index 82dee361bc7deadd4446a03b8f5c646a99fac506..bbbf69fa5925c0d1c6103736ff0972be76372205 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -21,19 +21,19 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index 881e3c88abf39f1d159007451e0d3d1413146b71..871b69af784a56870b2321f22e3a875ed3364aca 100644 (file)
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -20,22 +20,22 @@
                compatible = "gpio-leds";
 
                power_orange {
-                       label = "trendnet:orange:power";
+                       label = "orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "trendnet:green:power";
+                       label = "green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
                planet_green {
-                       label = "trendnet:green:planet";
+                       label = "green:planet";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                planet_orange {
-                       label = "trendnet:orange:planet";
+                       label = "orange:planet";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 5dd06803e792c97407f28c332341b5843897dc14..94991a8f49d9be9857b863aa12d01cd2a2eb0757 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -17,43 +17,43 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "nbg6716:white:power";
+                       label = "white:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                internet {
-                       label = "nbg6716:white:internet";
+                       label = "white:internet";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                usb1 {
-                       label = "nbg6716:white:usb1";
+                       label = "white:usb1";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port1>;
                };
 
                usb2 {
-                       label = "nbg6716:white:usb2";
+                       label = "white:usb2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port0>;
                };
 
                wifi2g {
-                       label = "nbg6716:white:wifi2g";
+                       label = "white:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5g {
-                       label = "nbg6716:white:wifi5g";
+                       label = "white:wifi5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps {
-                       label = "nbg6716:white:wps";
+                       label = "white:wps";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index e05f4bb45f324ff70c0d40a1af896316f44b4543..e7e421c076055a8ff6524ca56f66c620386ffa89 100644 (file)
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -46,34 +46,34 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "fritz4020:green:power";
+                       label = "green:power";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "fritz4020:green:wlan";
+                       label = "green:wlan";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "fritz4020:green:lan";
+                       label = "green:lan";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "fritz4020:green:wan";
+                       label = "green:wan";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                info {
-                       label = "fritz4020:green:info";
+                       label = "green:info";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_info_red: info_red {
-                       label = "fritz4020:red:info";
+                       label = "red:info";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index 02f54097f34a72f9ecfa23d7ec815d78a3547b29..6659bbe6882687aa8ce594eeaeb939516d3e0708 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -57,55 +57,55 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_green {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "tp-link:amber:wan";
+                       label = "amber:wan";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index fe8569c42763d02157df916d1f0c1c2f3436147a..4430d05247ec2e03964d3d4c760b398756c424b4 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -9,7 +9,7 @@
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "usbport";
                trigger-sources = <&hub_port>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 2d6294442114839e06cf68349462854e567231f6..c407dc3cde1f5a8022f5222c433d542f5103dc3d 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -9,7 +9,7 @@
 
 &leds {
        usb     {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "usbport";
                trigger-sources = <&hub_port>;

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index a5933d27e712c888677687a3985692de330b80fe..9ba6ccfafdbe5a27e410b19a90b5a2cb39f1a7aa 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -40,40 +40,40 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_green {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "tp-link:amber:wan";
+                       label = "amber:wan";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
index a46b537d3e4b0b8911b42a6fbae5d39e5018f0e9..2a6bea30f2b5fe052cb87b3e23f432047fa027be 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v1.dts
@@ -9,12 +9,12 @@
 
 &leds {
        wan_amber {
-               label = "tp-link:amber:wan";
+               label = "amber:wan";
                gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
        };
 
        wps {
-               label = "tp-link:green:wps";
+               label = "green:wps";
                gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
index 5c8564154c0b9f3de7ec90807fea2f23f20b8829..afef276db2e99a563b1006ccef6c090eba4efe3c 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v2.dts
@@ -9,12 +9,12 @@
 
 &leds {
        wan_amber {
-               label = "tp-link:amber:wan";
+               label = "amber:wan";
                gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
        };
 
        wps {
-               label = "tp-link:green:wps";
+               label = "green:wps";
                gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
        };
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
index 67cef957c9f18b82daff658e1f26ec96b714656c..cda2a3615bee4b7e622f8c04bfa582ed71578a54 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c60-v3.dts
@@ -9,7 +9,7 @@
 
 &leds {
        wan_amber {
-               label = "tp-link:amber:wan";
+               label = "amber:wan";
                gpios = <&gpio 19 GPIO_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 9c46a1b22291abc23c9fbb89b3644d2952413aec..7ba94aa42e8b8f0e7eb3437eb6dd9b081c34119f 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -34,30 +34,30 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_green {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
index 0e93e06e2f0bd001031ea51d5ffb62a40f68be1f..21203451cb0389b6dc6898e82b741373bb551f76 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_eap225-wall-v2.dts
@@ -39,7 +39,7 @@
                compatible = "gpio-leds";
 
                led_status: status {
-                       label = "tp-link:white:status";
+                       label = "white:status";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 077724d4b978658e50e61079ea77a7bdf3c46261..a403877c894a9fd4e231ddc9cafade8e40f0fc57 100644 (file)
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -36,17 +36,17 @@
                compatible = "gpio-leds";
 
                led_red: led_red {
-                       label = "mi-router-4q:red:led";
+                       label = "red:led";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                led_yellow: led_yellow {
-                       label = "mi-router-4q:yellow:led";
+                       label = "yellow:led";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
                led_blue: led_blue {
-                       label = "mi-router-4q:blue:led";
+                       label = "blue:led";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_compex_wpj563.dts b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
index a85f99881ce50b454881665e50ed8671ff4684f4..913155a0bde73ef4e64058d0c0265de98a28f96f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_compex_wpj563.dts
+++ b/target/linux/ath79/dts/qca9563_compex_wpj563.dts
@@ -37,22 +37,22 @@
                compatible = "gpio-leds";
 
                sig1 {
-                       label = "wpj563:green:sig1";
+                       label = "green:sig1";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                sig2 {
-                       label = "wpj563:green:sig2";
+                       label = "green:sig2";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                sig3 {
-                       label = "wpj563:green:sig4";
+                       label = "green:sig4";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_sig4: sig4 {
-                       label = "wpj563:green:sig4";
+                       label = "green:sig4";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
index 754d5fad1cfef4708ac7aacccc38da4a3a1ba308..02a3e3e44a35296881ec7321c2140cb8459c75c2 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c.dtsi
@@ -6,6 +6,13 @@
 #include <dt-bindings/input/input.h>
 
 / {
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        keys {
                compatible = "gpio-keys";
 
@@ -21,6 +28,26 @@
                        debounce-interval = <60>;
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led_power: power {
+                       label = "green:power";
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+               };
+
+               wps {
+                       label = "green:wps";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+               };
+
+               wlan {
+                       label = "green:wlan";
+                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
+               };
+       };
 };
 
 &uart {

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
index de7ad15cc7d08eb9d81e2380fe63a7d56187f1e1..23f912df32ed47b6b03d49952369783b5673075f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
@@ -5,31 +5,4 @@
 / {
        compatible = "dlink,dir-842-c1", "qca,qca9563";
        model = "D-Link DIR-842 C1";
-
-       aliases {
-               led-boot = &led_power;
-               led-failsafe = &led_power;
-               led-running = &led_power;
-               led-upgrade = &led_power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_power: power {
-                       label = "dir-842-c1:green:power";
-                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-               };
-
-               wps {
-                       label = "dir-842-c1:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "dir-842-c1:green:wlan";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
index de0e554b7b19b1ec529a642c637f908f76bd8313..1a62764a92c735669df47f59ff2dc43dd0df15a3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
@@ -5,33 +5,6 @@
 / {
        compatible = "dlink,dir-842-c2", "qca,qca9563";
        model = "D-Link DIR-842 C2";
-
-       aliases {
-               led-boot = &led_power;
-               led-failsafe = &led_power;
-               led-running = &led_power;
-               led-upgrade = &led_power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_power: power {
-                       label = "dir-842-c2:green:power";
-                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-               };
-
-               wps {
-                       label = "dir-842-c2:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "dir-842-c2:green:wlan";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };
 
 &usb_phy0 {

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
index 6954a330dcb14a1f73deddf56393bbeeda51b469..e43113ad5f7cae34d4f1b7b040fd5fdbdb9fd010 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
@@ -5,31 +5,4 @@
 / {
        compatible = "dlink,dir-842-c3", "qca,qca9563";
        model = "D-Link DIR-842 C3";
-
-       aliases {
-               led-boot = &led_power;
-               led-failsafe = &led_power;
-               led-running = &led_power;
-               led-upgrade = &led_power;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led_power: power {
-                       label = "dir-842-c3:green:power";
-                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-               };
-
-               wps {
-                       label = "dir-842-c3:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
-               wlan {
-                       label = "dir-842-c3:green:wlan";
-                       gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
-       };
 };

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
index 0197921ec4a314cb6c6af9b9c6ead51cbf551221..572a0bc6eae263aaac01bc8589d99b0cce53e418 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
@@ -20,22 +20,22 @@
                compatible = "gpio-leds";
 
                wps {
-                       label = "dir-859-a1:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_power: power {
-                       label = "dir-859-a1:green:power";
+                       label = "green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                internet {
-                       label = "dir-859-a1:green:internet";
+                       label = "green:internet";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "dir-859-a1:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 c4450fea1a7767208e36b3ad9d7c26d65caaf87d..b4f7718230a61c1a566990ae69fd3d54ed6b9353 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
@@ -9,19 +9,19 @@
 
 &leds {
        led_power: power {
-               label = "elecom:blue:power";
+               label = "blue:power";
                gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                default-state = "on";
        };
 
        wlan2g {
-               label = "elecom:blue:wlan2g";
+               label = "blue:wlan2g";
                gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "phy1tpt";
        };
 
        wlan5g {
-               label = "elecom:blue:wlan5g";
+               label = "blue:wlan5g";
                gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "phy0tpt";
        };

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
index 18074c72b4e49f1b3167a6d59e5bd57b92c88e95..3af6f59d094e19e3585d08c0eb6aa7a4d142cd77 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
@@ -9,13 +9,13 @@
 
 &leds {
        led_power: power {
-               label = "elecom:white:power";
+               label = "white:power";
                gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                default-state = "on";
        };
 
        wlan2g {
-               label = "elecom:white:wlan2g";
+               label = "white:wlan2g";
                gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "phy0tpt";
        };

diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
index ebe4a0ff5260635de6f650dd975ce57ad3ed2eda..7efdfa62af017b4f6aa5d7eda8139b16f77eed6d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
@@ -17,7 +17,7 @@
                compatible = "gpio-leds";
 
                wps {
-                       label = "elecom:red:wps";
+                       label = "red:wps";
                        gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
index 762cc895ea547026e453b438ff70eee35b1e21c2..24b0860d7c3317c39e7fe48f66157e09cb859102 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dtsi
@@ -41,19 +41,19 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "gl-ar750s:green:power";
+                       label = "green:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                led_wlan2g: wlan2g {
-                       label = "gl-ar750s:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                led_wlan5g: wlan5g {
-                       label = "gl-ar750s:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
index d5a14ab470cf65a6c349a88a375a65a9c6f1cc3d..0f77cfa5f1a2b737c08da75c460eeef139c8e6bb 100644 (file)
--- a/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
@@ -21,13 +21,13 @@
                /* other LEDs are connected to ath10k (QCA9888) gpiochip */
 
                led_power_green: power_green {
-                       label = "wg1200cr:green:power";
+                       label = "green:power";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                led_power_red: power_red {
-                       label = "wg1200cr:red:power";
+                       label = "red:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
index 607db3ca22e1c3a3ccd36d2fa785b0cd79ad8e96..befd1620e900adc52546fdd6bdb5acb0ca7fed5a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
+++ b/target/linux/ath79/dts/qca9563_nec_wg800hp.dts
@@ -22,44 +22,44 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                wlan2g_red {
-                       label = "wg800hp:red:wlan2g";
+                       label = "red:wlan2g";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                active_red {
-                       label = "wg800hp:red:active";
+                       label = "red:active";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                active_green {
-                       label = "wg800hp:green:active";
+                       label = "green:active";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: power_red {
-                       label = "wg800hp:red:power";
+                       label = "red:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_power_green: power_green {
-                       label = "wg800hp:green:power";
+                       label = "green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan5g_red {
-                       label = "wg800hp:red:wlan5g";
+                       label = "red:wlan5g";
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
 
                wlan5g_green {
-                       label = "wg800hp:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan2g_green {
-                       label = "wg800hp:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 173dfdd5571a46ae5d6cb8caa33535b06fd0bd3c..ca29336147de3ef7f26f4ee15998e71e9f47c74d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -49,34 +49,34 @@
                pinctrl-0 = <&jtag_disable_pins>;
 
                led_power_green: power_green {
-                       label = "netgear:green:power";
+                       label = "green:power";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                led_power_amber: power_amber {
-                       label = "netgear:amber:power";
+                       label = "amber:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wan_green {
-                       label = "netgear:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                wan_amber {
-                       label = "netgear:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g_green {
-                       label = "netgear:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -85,7 +85,7 @@
                compatible = "gpio-leds";
 
                wlan5g_blue {
-                       label = "netgear:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
index 07e2ad0548361c9ff399fb00bd87fd45f1ac034c..8682413b0b0076807fae903b1e48cb182a1a7932 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr4300-v2.dts
@@ -9,7 +9,7 @@
 
 &leds {
        usb_green {
-               label = "netgear:green:usb";
+               label = "green:usb";
                gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port0>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
index d5cd01eac48ead7c80575de17c0a616953354902..6e25215501c5996e2fa775b932c0605d46d13c05 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
@@ -9,14 +9,14 @@
 
 &leds {
        usb1_green {
-               label = "netgear:green:usb1";
+               label = "green:usb1";
                gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port0>;
                linux,default-trigger = "usbport";
        };
 
        usb2_green {
-               label = "netgear:green:usb2";
+               label = "green:usb2";
                gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port1>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
index 94a10d45f79f691cbb7fc547b949d909193ec403..e89a4de1ee041286c341317aeeb685337ab7ddf3 100644 (file)
--- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
+++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts
@@ -20,17 +20,17 @@
                compatible = "gpio-leds";
 
                status_blue {
-                       label = "phicomm:blue:status";
+                       label = "blue:status";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                led_status_red: status_red {
-                       label = "phicomm:red:status";
+                       label = "red:status";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
 
                status_yellow {
-                       label = "phicomm:yellow:status";
+                       label = "yellow:status";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index d37e1aed37cf892cf744f247f2d589432b8c4ee3..ce73d0838fd04cf3c948917429e1bebf159a9844 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -20,12 +20,12 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "wr818:red:system";
+                       label = "red:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wifi_2g {
-                       label = "wr818:red:wifi2g";
+                       label = "red:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 2ef5bee281adc237320bec07370f2919ba79a786..95ac123f48576d4f8594775c3e046bfc94475b87 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
@@ -20,55 +20,55 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wifi2g {
-                       label = "tp-link:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5g {
-                       label = "tp-link:green:wifi5g";
+                       label = "green:wifi5g";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi_wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 21 GPIO_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 d09ee56d53595d33fa744828f2798bef42418979..399f410612214502866dbd679c51d7663fc756f9 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
@@ -17,40 +17,40 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 1 GPIO_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 9f4386c2c291a3eb5626765be22a49111e77c5f5..d00320ad0266aeb73f587d05e9c1eeb1a5c40470 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c6-v2.dts
@@ -17,40 +17,40 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:amber:wan";
+                       label = "amber:wan";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 5f6657001345a914508d9ba2f0c4a4cae23cfc69..77ba6c4ffbea813f3ae57e7786ac207d9b4630e0 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -57,69 +57,69 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                usb1 {
-                       label = "tp-link:green:usb1";
+                       label = "green:usb1";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port1>;
                        linux,default-trigger = "usbport";
                };
 
                usb2 {
-                       label = "tp-link:green:usb2";
+                       label = "green:usb2";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&led_gpio 0 GPIO_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 7f79165cb4065d245672c0176a0d309b8c06cf8c..63c9977c6c9e1d3ff9b4ba08d103341d054c370f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -18,62 +18,62 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                usb {
-                       label = "tp-link:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
                wlan5g {
-                       label = "tp-link:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan2g {
-                       label = "tp-link:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
index 321b6296d193e75ff6b1c5c08a41c3061f2a70ea..184c208f5851e6f06f6f60f67a0648517083c465 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v3.dts
@@ -21,13 +21,13 @@
                compatible = "gpio-leds";
 
                led_status_green: status_green {
-                       label = "tp-link:green:status";
+                       label = "green:status";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                led_status_amber: status_amber {
-                       label = "tp-link:amber:status";
+                       label = "amber:status";
                        gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
index ed8d90710eac83982bc178d4de4a2b16170211ff..85b9cf6a10c02dc94eb6969d248df610d6c70a8a 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_re450.dtsi
@@ -19,39 +19,39 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wlan2g {
-                       label = "tp-link:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wlan5g {
-                       label = "tp-link:blue:wlan5g";
+                       label = "blue:wlan5g";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                lan_link {
-                       label = "tp-link:green:lan_link";
+                       label = "green:lan_link";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan_data {
-                       label = "tp-link:green:lan_data";
+                       label = "green:lan_data";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
 
                wps_blue {
-                       label = "tp-link:blue:wps";
+                       label = "blue:wps";
                        gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                };
 
                wps_red {
-                       label = "tp-link:red:wps";
+                       label = "red:wps";
                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
index 49fa914bd32ac4b88c8d772643c8356f5354f008..0ce1da832c4e96486887af25ee4554122a51b463 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi
@@ -49,23 +49,23 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "tp-link:green:power";
+                       label = "green:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                wifi2g {
-                       label = "tp-link:green:wifi2g";
+                       label = "green:wifi2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
                wifi5g {
-                       label = "tp-link:green:wifi5g";
+                       label = "green:wifi5g";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
index 2704d4c8cdaa783e59fb0220c25240478db9812d..b8f48047e2d82663c96f8f8138180df46022a4c9 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
@@ -18,49 +18,49 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
                };
 
                wifi_green {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi_wps {
-                       label = "tp-link:green:wps";
+                       label = "green:wps";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "tp-link:green:wan";
+                       label = "green:wan";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
                wan_fail {
-                       label = "tp-link:orange:wan";
+                       label = "orange:wan";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "tp-link:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:green:lan3";
+                       label = "green:lan3";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:green:lan4";
+                       label = "green:lan4";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
index 7603898def49d56758551a0c7788f1d7c6e3c49d..2f2d59ebd3de3eae95a5a96e9b09603bf0b09a24 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -80,7 +80,7 @@
 
 &leds {
        usb {
-               label = "tp-link:green:usb";
+               label = "green:usb";
                gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                trigger-sources = <&hub_port0>;
                linux,default-trigger = "usbport";

diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
index 51cefa3f34d61c2e980d4ebb7284ffc06a4c7431..7a5a957f7b63065ef64e40347071e69769dce030 100644 (file)
--- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
+++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi
@@ -17,12 +17,12 @@
                compatible = "gpio-leds";
 
                led_white: led_white {
-                       label = "ubnt:white:dome";
+                       label = "white:dome";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
 
                led_blue: led_blue {
-                       label = "ubnt:blue:dome";
+                       label = "blue:dome";
                        gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
                };
        };

diff --git a/target/linux/ath79/dts/qca9563_yuncore_a782.dts b/target/linux/ath79/dts/qca9563_yuncore_a782.dts
index 3774b75365d2d42937133ab326184b295bcbc8a1..5a84195bfbfcf030f0af97f11ebf861a90299515 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_a782.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_a782.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "a782:red:system";
+                       label = "red:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan2g {
-                       label = "a782:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
index 5865e9526b43c586f0a9b6e44b4972cd37dca9a1..05032fc955a256b7b15cc1340d3aeb1b4e85a0a0 100644 (file)
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
@@ -17,13 +17,13 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "xd4200:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                wlan2g {
-                       label = "xd4200:blue:wlan2g";
+                       label = "blue:wlan2g";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
index 992c14842b9666a80888862177a5874dc546e5c3..6b27468551e22f54070fef45327deeb83a31cebb 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wa901nd.dtsi
@@ -24,23 +24,23 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                lan {
-                       label = "tp-link:green:lan";
+                       label = "green:lan";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };

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 dcb450a2d3a0889d73ba6188fb6471f39dbacf6e..5c897b16a099048c7abd0e6e498f5639f8be8ccb 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -14,49 +14,49 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                qss {
-                       label = "tp-link:blue:qss";
+                       label = "blue:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_blue {
-                       label = "tp-link:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan_red {
-                       label = "tp-link:red:wan";
+                       label = "red:wan";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                lan1 {
-                       label = "tp-link:blue:lan1";
+                       label = "blue:lan1";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:blue:lan2";
+                       label = "blue:lan2";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:blue:lan3";
+                       label = "blue:lan3";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:blue:lan4";
+                       label = "blue:lan4";
                        gpios = <&gpio 4 GPIO_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 88aff2c4cc8b53bcaa320179eaa1320411c6d8c5..21a2be993cdc970e7432f5f56f9d3d6c57801fd4 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts
@@ -17,49 +17,49 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:blue:system";
+                       label = "blue:system";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                qss {
-                       label = "tp-link:blue:qss";
+                       label = "blue:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "tp-link:blue:wlan";
+                       label = "blue:wlan";
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wan_blue {
-                       label = "tp-link:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan_red {
-                       label = "tp-link:red:wan";
+                       label = "red:wan";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
 
                lan1 {
-                       label = "tp-link:blue:lan1";
+                       label = "blue:lan1";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "tp-link:blue:lan2";
+                       label = "blue:lan2";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                lan3 {
-                       label = "tp-link:blue:lan3";
+                       label = "blue:lan3";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
                lan4 {
-                       label = "tp-link:blue:lan4";
+                       label = "blue:lan4";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
        };

diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
index 5a6e65464ae8878f83322f7d3ab7709e1a71efa6..4334b70ce87d25c2d19386649d0769b14bfb5ad3 100644 (file)
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v6.dts
@@ -17,12 +17,12 @@
                compatible = "gpio-leds";
 
                wan_blue {
-                       label = "tp-link:blue:wan";
+                       label = "blue:wan";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                led_diag_orange: diag_orange {
-                       label = "tp-link:orange:diag";
+                       label = "orange:diag";
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };

diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index 9f6fd000313f4965a28f46aaf0a7beaa02f18756..b759bfb5f66b7663c992cb6e6148f7a22e886c7d 100755 (executable)
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -5,288 +5,272 @@
 board_config_update
 
 board=$(board_name)
-boardname="${board##*,}"
 
 case "$board" in
 8dev,carambola2)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:orange:eth0" "eth0"
-       ucidef_set_led_switch "wan" "WAN" "$boardname:orange:eth1" "switch0" "0x04"
+       ucidef_set_led_netdev "lan" "LAN" "orange:eth0" "eth0"
+       ucidef_set_led_switch "wan" "WAN" "orange:eth1" "switch0" "0x04"
        ;;
 alfa-network,ap121f|\
 alfa-network,ap121fe|\
-avm,fritz450e)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
+avm,fritz450e|\
+glinet,6408|\
+glinet,6416|\
+glinet,gl-ar300m-lite|\
+glinet,gl-ar300m16|\
+pcs,cap324|\
+tplink,cpe610-v1|\
+tplink,cpe610-v2)
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ;;
 alfa-network,n2q)
-       ucidef_set_led_netdev "lan2" "LAN2" "$boardname:orange:lan2" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "$boardname:orange:lan1" "switch0" "0x10"
+       ucidef_set_led_netdev "lan2" "LAN2" "orange:lan2" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "orange:lan1" "switch0" "0x10"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "signal1" "SIGNAL1" "$boardname:red:signal1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "signal2" "SIGNAL2" "$boardname:orange:signal2" "wlan0" "33" "100"
-       ucidef_set_led_rssi "signal3" "SIGNAL3" "$boardname:green:signal3" "wlan0" "66" "100"
+       ucidef_set_led_rssi "signal1" "SIGNAL1" "red:signal1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "signal2" "SIGNAL2" "orange:signal2" "wlan0" "33" "100"
+       ucidef_set_led_rssi "signal3" "SIGNAL3" "green:signal3" "wlan0" "66" "100"
        ;;
 alfa-network,n5q)
-       ucidef_set_led_netdev "lan2" "LAN2" "$boardname:green:lan2" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x10"
+       ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "signal1" "SIGNAL1" "$boardname:red:signal1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "signal2" "SIGNAL2" "$boardname:orange:signal2" "wlan0" "25" "100"
-       ucidef_set_led_rssi "signal3" "SIGNAL3" "$boardname:green:signal3" "wlan0" "50" "100"
-       ucidef_set_led_rssi "signal4" "SIGNAL4" "$boardname:green:signal4" "wlan0" "75" "100"
+       ucidef_set_led_rssi "signal1" "SIGNAL1" "red:signal1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "signal2" "SIGNAL2" "orange:signal2" "wlan0" "25" "100"
+       ucidef_set_led_rssi "signal3" "SIGNAL3" "green:signal3" "wlan0" "50" "100"
+       ucidef_set_led_rssi "signal4" "SIGNAL4" "green:signal4" "wlan0" "75" "100"
        ;;
 alfa-network,r36a)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:blue:lan" "eth0"
-       ucidef_set_led_switch "wan" "WAN" "$boardname:blue:wan" "switch0" "0x10"
+       ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
+       ucidef_set_led_switch "wan" "WAN" "blue:wan" "switch0" "0x10"
        ;;
 avm,fritz1750e)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan1" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan1" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssi1" "wlan1" "20" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:green:rssi2" "wlan1" "40" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssi3" "wlan1" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssi4" "wlan1" "80" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:rssi0" "wlan1" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:rssi1" "wlan1" "20" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "green:rssi2" "wlan1" "40" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssi3" "wlan1" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssi4" "wlan1" "80" "100"
        ;;
 avm,fritz300e)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssi1" "wlan0" "20" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:green:rssi2" "wlan0" "40" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssi3" "wlan0" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssi4" "wlan0" "80" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:rssi0" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:rssi1" "wlan0" "20" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "green:rssi2" "wlan0" "40" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssi3" "wlan0" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssi4" "wlan0" "80" "100"
        ;;
-avm,fritz4020)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
-       ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x1E"
+avm,fritz4020|\
+tplink,archer-c58-v1|\
+tplink,archer-c59-v1|\
+tplink,archer-c59-v2|\
+tplink,archer-c60-v1|\
+tplink,archer-c60-v2|\
+tplink,archer-c60-v3)
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x1e"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
        ;;
 avm,fritzdvbc)
        ucidef_set_rssimon "wlan1" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssilow" "wlan1" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssimediumlow" "wlan1" "20" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:green:rssimedium" "wlan1" "40" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan1" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan1" "80" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:rssilow" "wlan1" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:rssimediumlow" "wlan1" "20" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "green:rssimedium" "wlan1" "40" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan1" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan1" "80" "100"
        ;;
 comfast,cf-e110n-v2)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
-       ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x02"
-       ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x02"
+       ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "red:rssimediumlow" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 comfast,cf-e120a-v3)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
-       ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x04"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x04"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "red:rssimediumlow" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 comfast,cf-e130n-v2)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "red:rssimediumlow" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 comfast,cf-e313ac)
-       ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02"
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "red:rssimediumlow" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 comfast,cf-e314n-v2)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:red:rssimediumlow" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "red:rssimediumlow" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 comfast,cf-e5)
-       ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x02"
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:blue:rssi0" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:blue:rssi1" "wlan0" "33" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:blue:rssi2" "wlan0" "66" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "blue:rssi0" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "blue:rssi1" "wlan0" "33" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "blue:rssi2" "wlan0" "66" "100"
        ;;
 comfast,cf-e560ac)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "$boardname:blue:lan1" "switch0" "0x02"
-       ucidef_set_led_switch "lan2" "LAN2" "$boardname:blue:lan2" "switch0" "0x04"
-       ucidef_set_led_switch "lan3" "LAN3" "$boardname:blue:lan3" "switch0" "0x08"
-       ucidef_set_led_switch "lan4" "LAN4" "$boardname:blue:lan4" "switch0" "0x10"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x02"
+       ucidef_set_led_switch "lan2" "LAN2" "blue:lan2" "switch0" "0x04"
+       ucidef_set_led_switch "lan3" "LAN3" "blue:lan3" "switch0" "0x08"
+       ucidef_set_led_switch "lan4" "LAN4" "blue:lan4" "switch0" "0x10"
        ;;
 comfast,cf-ew72|\
 telco,t1)
-       ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x02"
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
        ;;
 comfast,cf-wr752ac-v1|\
 engenius,ecb1750|\
 enterasys,ws-ap3705i)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:blue:lan" "eth0"
-       ;;
-compex,wpj344-16m)
-       ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "sig1" "SIG1" "wpj344:red:sig1" "wlan0" "85" "100"
-       ucidef_set_led_rssi "sig2" "SIG2" "wpj344:yellow:sig2" "wlan0" "75" "100"
-       ucidef_set_led_rssi "sig3" "SIG3" "wpj344:green:sig3" "wlan0" "65" "100"
-       ucidef_set_led_rssi "sig4" "SIG4" "wpj344:green:sig4" "wlan0" "50" "100"
+       ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
        ;;
+compex,wpj344-16m|\
 compex,wpj531-16m)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "sig1" "SIG1" "wpj531:red:sig1" "wlan0" "85" "100"
-       ucidef_set_led_rssi "sig2" "SIG2" "wpj531:yellow:sig2" "wlan0" "75" "100"
-       ucidef_set_led_rssi "sig3" "SIG3" "wpj531:green:sig3" "wlan0" "65" "100"
-       ucidef_set_led_rssi "sig4" "SIG4" "wpj531:green:sig4" "wlan0" "50" "100"
+       ucidef_set_led_rssi "sig1" "SIG1" "red:sig1" "wlan0" "85" "100"
+       ucidef_set_led_rssi "sig2" "SIG2" "yellow:sig2" "wlan0" "75" "100"
+       ucidef_set_led_rssi "sig3" "SIG3" "green:sig3" "wlan0" "65" "100"
+       ucidef_set_led_rssi "sig4" "SIG4" "green:sig4" "wlan0" "50" "100"
        ;;
 devolo,magic-2-wifi)
-       ucidef_set_led_netdev "plcw" "dLAN" "devolo:white:dlan" "eth0.1" "rx"
+       ucidef_set_led_netdev "plcw" "dLAN" "white:dlan" "eth0.1" "rx"
        ;;
 dlink,dap-1330-a1|\
 dlink,dap-1365-a1)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "d-link:red:rssilow" "wlan0" "1" "25"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "d-link:green:rssimediumlow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "d-link:green:rssimediumhigh" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "d-link:green:rssihigh" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1" "25"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:rssimediumlow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssimediumhigh" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "76" "100"
        ;;
 dlink,dir-859-a1)
-       ucidef_set_led_switch "internet" "WAN" "$boardname:green:internet" "switch0" "0x20"
+       ucidef_set_led_switch "internet" "WAN" "green:internet" "switch0" "0x20"
        ;;
 engenius,enh202-v1)
-       ucidef_set_led_switch "lan" "LAN" "$boardname:amber:lan" "switch0" "0x10"
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
+       ucidef_set_led_switch "lan" "LAN" "amber:lan" "switch0" "0x10"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1"  "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:amber:rssimedium" "wlan0" "33" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "67" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1"  "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "amber:rssimedium" "wlan0" "33" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "67" "100"
        ;;
 engenius,ens202ext-v1)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:red:rssilow" "wlan0" "1"  "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:amber:rssimedium" "wlan0" "33" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan0" "67" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:rssilow" "wlan0" "1"  "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "amber:rssimedium" "wlan0" "33" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "67" "100"
        ;;
 engenius,ews511ap)
-       ucidef_set_led_netdev "lan1" "LAN1" "$boardname:blue:lan1" "eth1"
-       ucidef_set_led_netdev "lan2" "LAN2" "$boardname:blue:lan2" "eth0"
+       ucidef_set_led_netdev "lan1" "LAN1" "blue:lan1" "eth1"
+       ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "eth0"
        ;;
 etactica,eg200)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:red:eth0" "eth0"
-       ucidef_set_led_oneshot "modbus" "Modbus" "$boardname:red:modbus" "100" "33"
-       ;;
-glinet,6408|\
-glinet,6416)
-       ucidef_set_led_netdev "lan" "LAN" "gl-inet:green:lan" "eth0"
-       ;;
-glinet,gl-ar300m-lite)
-       ucidef_set_led_netdev "lan" "LAN" "gl-ar300m-lite:green:lan" "eth0"
-       ;;
-glinet,gl-ar300m16)
-       ucidef_set_led_netdev "lan" "LAN" "gl-ar300m:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "red:eth0" "eth0"
+       ucidef_set_led_oneshot "modbus" "Modbus" "red:modbus" "100" "33"
        ;;
 glinet,gl-mifi)
-       ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02"
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
        ;;
 glinet,gl-x750)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
        ;;
 hak5,lan-turtle)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:orange:system" "eth1"
+       ucidef_set_led_netdev "wan" "WAN" "orange:system" "eth1"
        ;;
 meraki,mr16)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
        ;;
 netgear,wnr2200-8m|\
 netgear,wnr2200-16m)
-       ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
-       ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04"
-       ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" "0x04"
-       ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" "0x04"
-       ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" "0x04"
-       ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" "0x02"
-       ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" "0x02"
-       ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" "0x02"
-       ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" "0x02"
-       ;;
-pcs,cap324)
-       ucidef_set_led_netdev "lan" "LAN" "pcs:green:lan" "eth0"
+       ucidef_set_led_netdev "wan-amber" "WAN (amber)" "amber:wan" "eth0"
+       ucidef_set_led_switch "lan1green" "LAN1 (green)" "green:lan1" "switch0" "0x02" "0x04"
+       ucidef_set_led_switch "lan2green" "LAN2 (green)" "green:lan2" "switch0" "0x04" "0x04"
+       ucidef_set_led_switch "lan3green" "LAN3 (green)" "green:lan3" "switch0" "0x08" "0x04"
+       ucidef_set_led_switch "lan4green" "LAN4 (green)" "green:lan4" "switch0" "0x10" "0x04"
+       ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "amber:lan1" "switch0" "0x02" "0x02"
+       ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "amber:lan2" "switch0" "0x04" "0x02"
+       ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "amber:lan3" "switch0" "0x08" "0x02"
+       ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "amber:lan4" "switch0" "0x10" "0x02"
        ;;
 pcs,cr3000)
-       ucidef_set_led_netdev "wan" "WAN" "pcs:blue:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "pcs:blue:lan1" "switch0" "0x04"
-       ucidef_set_led_switch "lan2" "LAN2" "pcs:blue:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "pcs:blue:lan3" "switch0" "0x10"
-       ucidef_set_led_switch "lan4" "LAN4" "pcs:blue:lan4" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x04"
+       ucidef_set_led_switch "lan2" "LAN2" "blue:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "blue:lan3" "switch0" "0x10"
+       ucidef_set_led_switch "lan4" "LAN4" "blue:lan4" "switch0" "0x02"
        ;;
 qihoo,c301)
-       ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt"
+       ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt"
        ;;
 samsung,wam250)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:white:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "white:lan" "eth0"
        ;;
 tplink,archer-a7-v5|\
 tplink,archer-c7-v4|\
 tplink,archer-c7-v5)
-       ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x02"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x20"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x02"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x04"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x10"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x20"
        ;;
 tplink,archer-c2-v3|\
 tplink,tl-wr1043nd-v4|\
 tplink,tl-wr1043n-v5)
-       ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x20"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x04"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
        ;;
 tplink,archer-c6-v2|\
 tplink,archer-c6-v2-us)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x3C"
-       ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x02"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x3c"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x02"
        ;;
 tplink,archer-c25-v1|\
 tplink,tl-wr842n-v3)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
-       ;;
-tplink,archer-c58-v1|\
-tplink,archer-c59-v1|\
-tplink,archer-c59-v2|\
-tplink,archer-c60-v1|\
-tplink,archer-c60-v2|\
-tplink,archer-c60-v3)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x1E"
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x04"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
        ;;
 tplink,archer-d50-v1)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:white:lan" "switch0" "0x1c"
-       ucidef_set_led_switch "wan_data" "WAN Data" "tp-link:white:internet" "switch0" "0x02" "" "tx rx"
-       ucidef_set_led_switch "wan_link" "WAN Link" "tp-link:white:wan" "switch0" "0x02" "" "link"
+       ucidef_set_led_switch "lan" "LAN" "white:lan" "switch0" "0x1c"
+       ucidef_set_led_switch "wan_data" "WAN Data" "white:internet" "switch0" "0x02" "" "tx rx"
+       ucidef_set_led_switch "wan_link" "WAN Link" "white:wan" "switch0" "0x02" "" "link"
        ;;
 tplink,archer-d7-v1|\
 tplink,archer-d7b-v1)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:white:lan" "switch0" "0x3c"
+       ucidef_set_led_switch "lan" "LAN" "white:lan" "switch0" "0x3c"
        ;;
 tplink,cpe210-v1|\
 tplink,cpe220-v2|\
@@ -296,66 +280,62 @@ tplink,wbs210-v1|\
 tplink,wbs210-v2|\
 tplink,wbs510-v1|\
 tplink,wbs510-v2)
-       ucidef_set_led_netdev "lan0" "LAN0" "tp-link:green:lan0" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
+       ucidef_set_led_netdev "lan0" "LAN0" "green:lan0" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:link1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:link2" "wlan0" "30" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "80" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:link1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:link2" "wlan0" "30" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:link3" "wlan0" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:link4" "wlan0" "80" "100"
        ;;
 tplink,cpe210-v2|\
 tplink,cpe210-v3)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:link1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:link2" "wlan0" "30" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "80" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:link1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:link2" "wlan0" "30" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:link3" "wlan0" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:link4" "wlan0" "80" "100"
        ;;
 tplink,cpe510-v2|\
 tplink,cpe510-v3)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:link1" "wlan0" "1" "100" "0" "13"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:link2" "wlan0" "26" "100" "-25" "13"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "51" "100" "-50" "13"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "76" "100" "-75" "13"
-       ;;
-tplink,cpe610-v1|\
-tplink,cpe610-v2)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "green:link1" "wlan0" "1" "100" "0" "13"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "green:link2" "wlan0" "26" "100" "-25" "13"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:link3" "wlan0" "51" "100" "-50" "13"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:link4" "wlan0" "76" "100" "-75" "13"
        ;;
 tplink,tl-wr902ac-v1)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
-       ucidef_set_led_netdev "internet" "Internet" "tp-link:green:internet" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
+       ucidef_set_led_netdev "internet" "Internet" "green:internet" "eth0"
        ;;
 tplink,re355-v1|\
 tplink,re450-v1|\
 tplink,re450-v2|\
 tplink,re450-v3)
-       ucidef_set_led_netdev "lan_data" "LAN Data" "tp-link:green:lan_data" "eth0" "tx rx"
-       ucidef_set_led_netdev "lan_link" "LAN Link" "tp-link:green:lan_link" "eth0" "link"
+       ucidef_set_led_netdev "lan_data" "LAN Data" "green:lan_data" "eth0" "tx rx"
+       ucidef_set_led_netdev "lan_link" "LAN Link" "green:lan_link" "eth0" "link"
        ;;
 tplink,tl-mr6400-v1)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:white:lan" "switch0" "0x0e"
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1"
-       ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0"
+       ucidef_set_led_switch "lan" "LAN" "white:lan" "switch0" "0x0e"
+       ucidef_set_led_netdev "wan" "WAN" "white:wan" "eth1"
+       ucidef_set_led_netdev "4g" "4G" "white:4g" "usb0"
        ;;
 tplink,tl-wpa8630-v1|\
 tplink,tl-wpa8630p-v2-eu|\
 tplink,tl-wpa8630p-v2-int)
-       ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x3c"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x3c"
        ;;
 tplink,tl-wr842n-v2)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x04"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x10"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
        ;;
 trendnet,tew-823dru)
-       ucidef_set_led_netdev "wan" "WAN" "trendnet:green:planet" "eth0"
+       ucidef_set_led_netdev "wan" "WAN" "green:planet" "eth0"
        ;;
 ubnt,bullet-m-ar7240|\
 ubnt,bullet-m-ar7241|\
@@ -369,43 +349,43 @@ ubnt,picostation-m|\
 ubnt,powerbridge-m|\
 ubnt,rocket-m)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:red:link1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:orange:link2" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link3" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link4" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "red:link1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "orange:link2" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "green:link3" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:link4" "wlan0" "76" "100"
        ;;
 ubnt,nanobeam-ac|\
 ubnt,nanostation-ac|\
 ubnt,powerbeam-5ac-gen2)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:blue:rssi0" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "ubnt:blue:rssi1" "wlan0" "26" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:blue:rssi2" "wlan0" "51" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:blue:rssi3" "wlan0" "76" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "blue:rssi0" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "blue:rssi1" "wlan0" "26" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "blue:rssi2" "wlan0" "51" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "blue:rssi3" "wlan0" "76" "100"
        ;;
 wallys,dr531)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
-       ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x2"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
+       ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x2"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "sig1" "SIG1" "$boardname:green:sig1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "sig2" "SIG2" "$boardname:green:sig2" "wlan0" "25" "100"
-       ucidef_set_led_rssi "sig3" "SIG3" "$boardname:green:sig3" "wlan0" "50" "100"
-       ucidef_set_led_rssi "sig4" "SIG4" "$boardname:green:sig4" "wlan0" "75" "100"
+       ucidef_set_led_rssi "sig1" "SIG1" "green:sig1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "sig2" "SIG2" "green:sig2" "wlan0" "25" "100"
+       ucidef_set_led_rssi "sig3" "SIG3" "green:sig3" "wlan0" "50" "100"
+       ucidef_set_led_rssi "sig4" "SIG4" "green:sig4" "wlan0" "75" "100"
        ;;
 wd,mynet-wifi-rangeextender)
-       ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:blue:rssi-low" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMED" "$boardname:blue:rssi-med" "wlan0" "33" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIMAX" "$boardname:blue:rssi-max" "wlan0" "66" "100"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "blue:rssi-low" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMED" "blue:rssi-med" "wlan0" "33" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIMAX" "blue:rssi-max" "wlan0" "66" "100"
        ;;
 yuncore,a770)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
-       ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x10"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x10"
        ;;
 zbtlink,zbt-wd323)
-       ucidef_set_led_switch "lan1" "LAN1" "zbt-wd323:orange:lan1" "switch0" "0x10"
-       ucidef_set_led_switch "lan2" "LAN2" "zbt-wd323:orange:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan1" "LAN1" "orange:lan1" "switch0" "0x10"
+       ucidef_set_led_switch "lan2" "LAN2" "orange:lan2" "switch0" "0x08"
        ;;
 esac
 

diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
index 15cf20573bc8c99f503c5dc3f0da7cb0a534d691..f439e9ccc75b7ef766dcfe01ece3ff94bea9cfb1 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
@@ -2,18 +2,14 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
-arduino,yun)
-       migrate_leds "arduino:=yun:"
-       ;;
 dlink,dap-1330-a1)
-       migrate_leds ":red:power=:red:status" \
-               ":red:wifi=:red:rssilow" \
-               ":green:wifi=:green:rssimediumlow" \
-               ":green:signal1=:green:rssimediumhigh" \
-               ":green:signal2=:green:rssihigh"
+       migrate_leds "red:power=red:status" \
+               "red:wifi=red:rssilow" \
+               "green:wifi=green:rssimediumlow" \
+               "green:signal1=green:rssimediumhigh" \
+               "green:signal2=green:rssihigh"
        ;;
 engenius,epg5000)
        migrate_leds ":wlan-2g=:wlan2g" ":wlan-5g=:wlan5g"
@@ -30,34 +26,15 @@ tplink,tl-wdr3600-v1|\
 tplink,tl-wdr4300-v1|\
 tplink,tl-wdr4300-v1-il|\
 tplink,tl-wdr4310-v1)
-       migrate_leds ":blue:=:green:"
-       ;;
-tplink,archer-c25-v1|\
-tplink,archer-c58-v1|\
-tplink,archer-c59-v1|\
-tplink,archer-c59-v2|\
-tplink,archer-c60-v1|\
-tplink,archer-c60-v2|\
-tplink,archer-c7-v4|\
-tplink,archer-c7-v5|\
-tplink,tl-wr902ac-v1)
-       migrate_leds "^$boardonly:=tp-link:"
-       ;;
-tplink,re355-v1)
-       migrate_leds "re355:=tp-link:"
-       ;;
-tplink,re450-v1)
-       migrate_leds "re450:=tp-link:"
+       migrate_leds "blue:=green:"
        ;;
 tplink,tl-wpa8630-v1)
-       migrate_leds "^tl-wpa8630:=tp-link:" \
-               ':wlan$=:wifi2g' ':wlan5$=:wifi5g'
-       ;;
-wd,mynet-n750)
-       migrate_leds "wd:=mynet-n750:"
+       migrate_leds ':wlan$=:wifi2g' ':wlan5$=:wifi5g'
        ;;
 esac
 
+remove_devicename_leds
+
 migrations_apply system
 
 exit 0

diff --git a/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds b/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
index 60858305955f21a12eac5ebfaec448c7ddd880e5..60dcef4ff683208820baf18ca5ef28c602c29943 100755 (executable)
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
@@ -5,19 +5,18 @@
 board_config_update
 
 board=$(board_name)
-boardname="${board##*,}"
 
 case "$board" in
 mikrotik,routerboard-lhg-2nd)
-       ucidef_set_led_netdev "lan" "lan" "mikrotik:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0"
        ;;
 mikrotik,routerboard-sxt-5nd-r2)
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "rssilow" "sxt5n:green:rssilow" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "rssimediumlow" "sxt5n:green:rssimediumlow" "wlan0" "20" "100"
-       ucidef_set_led_rssi "rssimedium" "rssimedium" "sxt5n:green:rssimedium" "wlan0" "40" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "rssimediumhigh" "sxt5n:green:rssimediumhigh" "wlan0" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "rssihigh" "sxt5n:green:rssihigh" "wlan0" "80" "100"
+       ucidef_set_led_rssi "rssilow" "rssilow" "green:rssilow" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "rssimediumlow" "green:rssimediumlow" "wlan0" "20" "100"
+       ucidef_set_led_rssi "rssimedium" "rssimedium" "green:rssimedium" "wlan0" "40" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "rssimediumhigh" "green:rssimediumhigh" "wlan0" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "rssihigh" "green:rssihigh" "wlan0" "80" "100"
        ;;
 esac
 

diff --git a/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
index c12a7ac02cbe2fcf002239253303d4a6a09d25c9..281d6ac0bcc65b0a808f38778dc16befd8ff3eb2 100644 (file)
--- a/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/mikrotik/base-files/etc/uci-defaults/04_led_migration
@@ -2,14 +2,12 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
-mikrotik,*)
-       migrate_leds "^rb:=mikrotik:"
-       ;;
 esac
 
+remove_devicename_leds
+
 migrations_apply system
 
 exit 0

diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
index 4f601849fcb780515f08e9434270ec30b5f70494..8eda666a8122178a8da3cb2ba8683b3bb3dde356 100755 (executable)
--- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
@@ -5,19 +5,18 @@
 board_config_update
 
 board=$(board_name)
-boardname="${board##*,}"
 
 case "$board" in
 glinet,gl-ar300m-nand|\
 glinet,gl-ar300m-nor)
-       ucidef_set_led_netdev "lan" "LAN" "gl-ar300m:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ;;
 netgear,wndr3700-v4|\
 netgear,wndr4300|\
 netgear,wndr4300sw|\
 netgear,wndr4300-v2|\
 netgear,wndr4500-v3)
-       ucidef_set_led_switch "wan-amber" "WAN (amber)" "netgear:amber:wan" "switch0" "0x20"
+       ucidef_set_led_switch "wan-amber" "WAN (amber)" "amber:wan" "switch0" "0x20"
        ;;
 esac
 

diff --git a/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration
new file mode 100644 (file)
index 0000000..281d6ac
--- /dev/null
+++ b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration
@@ -0,0 +1,13 @@
+. /lib/functions.sh
+. /lib/functions/migrations.sh
+
+board=$(board_name)
+
+case "$board" in
+esac
+
+remove_devicename_leds
+
+migrations_apply system
+
+exit 0

diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
index bc0b15bba5a18e1a2a586542e8e1e0364ca6aa22..26926b6f64b53814c08052fbe952b22479469b09 100755 (executable)
--- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
@@ -5,40 +5,39 @@
 board_config_update
 
 board=$(board_name)
-boardname="${board##*,}"
 
 case "$board" in
-buffalo,whr-g301n)
-       ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
-       ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x02"
-       ucidef_set_led_switch "lan2" "LAN2" "$boardname:green:lan2" "switch0" "0x04"
-       ucidef_set_led_switch "lan3" "LAN3" "$boardname:green:lan3" "switch0" "0x08"
-       ucidef_set_led_switch "lan4" "LAN4" "$boardname:green:lan4" "switch0" "0x10"
-       ;;
-dlink,dir-615-e4)
-       ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth0"
-       ucidef_set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02"
-       ucidef_set_led_switch "lan2" "LAN2" "d-link:green:lan2" "switch0" "0x04"
-       ucidef_set_led_switch "lan3" "LAN3" "d-link:green:lan3" "switch0" "0x08"
-       ucidef_set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10"
+buffalo,whr-g301n|\
+dlink,dir-615-e4|\
+tplink,tl-wr740n-v1|\
+tplink,tl-wr740n-v3|\
+tplink,tl-wr741-v1|\
+tplink,tl-wr743nd-v1|\
+tplink,tl-wr841-v5|\
+tplink,tl-wr941-v4)
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x02"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x04"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x08"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x10"
        ;;
 netgear,wnr1000-v2|\
 netgear,wnr2000-v3)
-       ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
-       ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04"
-       ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" "0x04"
-       ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" "0x04"
-       ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" "0x04"
-       ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" "0x02"
-       ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" "0x02"
-       ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" "0x02"
-       ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" "0x02"
+       ucidef_set_led_netdev "wan-amber" "WAN (amber)" "amber:wan" "eth0"
+       ucidef_set_led_switch "lan1green" "LAN1 (green)" "green:lan1" "switch0" "0x02" "0x04"
+       ucidef_set_led_switch "lan2green" "LAN2 (green)" "green:lan2" "switch0" "0x04" "0x04"
+       ucidef_set_led_switch "lan3green" "LAN3 (green)" "green:lan3" "switch0" "0x08" "0x04"
+       ucidef_set_led_switch "lan4green" "LAN4 (green)" "green:lan4" "switch0" "0x10" "0x04"
+       ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "amber:lan1" "switch0" "0x02" "0x02"
+       ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "amber:lan2" "switch0" "0x04" "0x02"
+       ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "amber:lan3" "switch0" "0x08" "0x02"
+       ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "amber:lan4" "switch0" "0x10" "0x02"
        ;;
 netgear,wnr612-v2|\
 on,n150r)
-       ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0"
-       ucidef_set_led_switch "lan1" "LAN1" "netgear:green:lan1" "switch0" "0x02" "0x0f"
-       ucidef_set_led_switch "lan2" "LAN2" "netgear:green:lan2" "switch0" "0x04" "0x0f"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x02" "0x0f"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x04" "0x0f"
        ;;
 tplink,tl-mr3020-v1|\
 tplink,tl-mr3040-v2|\
@@ -53,63 +52,51 @@ tplink,tl-wa901nd-v1|\
 tplink,tl-wa901nd-v3|\
 tplink,tl-wa901nd-v4|\
 tplink,tl-wa901nd-v5)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
        ;;
 tplink,tl-mr3420-v2|\
 tplink,tl-wr740n-v4|\
 tplink,tl-wr740n-v5|\
 tplink,tl-wr741nd-v4|\
 tplink,tl-wr841-v8)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x04"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x04"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x10"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
        ;;
 tplink,tl-mr3420-v3|\
 tplink,tl-wr841-v9|\
 tplink,tl-wr841-v10|\
 tplink,tl-wr841-v11|\
 tplink,tl-wr841-v12)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x10"
+       ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x04"
+       ucidef_set_led_switch "lan4" "LAN4" "green:lan4" "switch0" "0x02"
        ;;
 tplink,tl-wa850re-v1|\
 tplink,tl-wa850re-v2)
-       ucidef_set_led_netdev "lan" "LAN" "tp-link:blue:lan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
        ucidef_set_rssimon "wlan0" "200000" "1"
-       ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:blue:signal1" "wlan0" "1" "100"
-       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:blue:signal2" "wlan0" "20" "100"
-       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:blue:signal3" "wlan0" "40" "100"
-       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:blue:signal4" "wlan0" "60" "100"
-       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:blue:signal5" "wlan0" "80" "100"
-       ;;
-tplink,tl-wr740n-v1|\
-tplink,tl-wr740n-v3|\
-tplink,tl-wr741-v1|\
-tplink,tl-wr743nd-v1|\
-tplink,tl-wr841-v5|\
-tplink,tl-wr941-v4)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x02"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x04"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x08"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x10"
+       ucidef_set_led_rssi "rssilow" "RSSILOW" "blue:signal1" "wlan0" "1" "100"
+       ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "blue:signal2" "wlan0" "20" "100"
+       ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "blue:signal3" "wlan0" "40" "100"
+       ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "blue:signal4" "wlan0" "60" "100"
+       ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "blue:signal5" "wlan0" "80" "100"
        ;;
 tplink,tl-wr940n-v3|\
 tplink,tl-wr940n-v4|\
 tplink,tl-wr941nd-v6)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth1"
-       ucidef_set_led_switch "lan1" "LAN1" "tp-link:blue:lan1" "switch0" "0x10"
-       ucidef_set_led_switch "lan2" "LAN2" "tp-link:blue:lan2" "switch0" "0x08"
-       ucidef_set_led_switch "lan3" "LAN3" "tp-link:blue:lan3" "switch0" "0x04"
-       ucidef_set_led_switch "lan4" "LAN4" "tp-link:blue:lan4" "switch0" "0x02"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
+       ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x10"
+       ucidef_set_led_switch "lan2" "LAN2" "blue:lan2" "switch0" "0x08"
+       ucidef_set_led_switch "lan3" "LAN3" "blue:lan3" "switch0" "0x04"
+       ucidef_set_led_switch "lan4" "LAN4" "blue:lan4" "switch0" "0x02"
        ;;
 tplink,tl-wr940n-v6)
-       ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth1"
+       ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
        ;;
 esac
 

diff --git a/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
index 377135f530c41480e000a80c1cad243705cd8908..9850ed229379b32a2407921dc01a76309345cac6 100644 (file)
--- a/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/tiny/base-files/etc/uci-defaults/04_led_migration
@@ -2,17 +2,15 @@
 . /lib/functions/migrations.sh
 
 board=$(board_name)
-boardonly="${board##*,}"
 
 case "$board" in
 tplink,tl-wr802n-v1)
-       migrate_leds ":blue:=:green:"
-       ;;
-tplink,tl-wr802n-v2)
-       migrate_leds "^$boardonly:=tp-link:"
+       migrate_leds "blue:=green:"
        ;;
 esac
 
+remove_devicename_leds
+
 migrations_apply system
 
 exit 0