From: Adrian Schmutzler Date: Thu, 1 Oct 2020 19:15:47 +0000 (+0200) Subject: ipq40xx: remove model name from LED labels X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad90a42e48756e2de27a1ebad942fd18e9411713;p=openwrt%2Fstaging%2Frmilecki.git ipq40xx: remove model name from LED labels Like in the previous patches for ath79 and ramips, this will remove the "devicename" from LED labels in ipq40xx. The devicename is removed in DTS files and 01_leds, and a migration script is added. While at it, also harmonize capitalization of wlan2G/wlan5G vs. wlan2g/wlan5g. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds index e8e67af3a92..8a87b685327 100755 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds @@ -8,68 +8,64 @@ board_config_update board=$(board_name) -boardname="${board##*,}" case "$board" in alfa-network,ap120c-ac) - ucidef_set_led_netdev "wan" "WAN" "${boardname}:amber:wan" "eth1" + ucidef_set_led_netdev "wan" "WAN" "amber:wan" "eth1" ;; asus,rt-ac58u) - ucidef_set_led_netdev "wan" "WAN" "${boardname}:blue:wan" "eth1" - ucidef_set_led_switch "lan" "LAN" "${boardname}:blue:lan" "switch0" "0x1e" + ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" + ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x1e" ;; avm,fritzbox-4040) - ucidef_set_led_wlan "wlan" "WLAN" "fritz4040:green:wlan" "phy0tpt" "phy1tpt" - ucidef_set_led_netdev "wan" "WAN" "fritz4040:green:wan" "eth1" - ucidef_set_led_switch "lan" "LAN" "fritz4040:green:lan" "switch0" "0x1e" + ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt" + ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" + ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x1e" ;; avm,fritzbox-7530 |\ glinet,gl-b1300) - ucidef_set_led_wlan "wlan" "WLAN" "${boardname}:green:wlan" "phy0tpt" + ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" + ;; +edgecore,ecw5211 |\ +zyxel,nbg6617 |\ +zyxel,wre6606) + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" ;; edgecore,oap100) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:blue:wlan5g" "phy1tpt" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt" ;; engenius,eap1300) - ucidef_set_led_netdev "lan" "LAN" "${boardname}:blue:lan" "eth0" - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:yellow:wlan5g" "phy1tpt" - ucidef_set_led_default "mesh" "MESH" "${boardname}:blue:mesh" "0" + ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "yellow:wlan5g" "phy1tpt" + ucidef_set_led_default "mesh" "MESH" "blue:mesh" "0" ;; engenius,eap2200) - ucidef_set_led_netdev "lan1" "LAN1" "${boardname}:blue:lan1" "eth0" - ucidef_set_led_netdev "lan2" "LAN2" "${boardname}:blue:lan2" "eth1" + ucidef_set_led_netdev "lan1" "LAN1" "blue:lan1" "eth0" + ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "eth1" ;; engenius,ens620ext) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2G" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5G" "phy1tpt" - ucidef_set_led_netdev "lan1" "LAN1" "${boardname}:green:lan1" "eth0" - ucidef_set_led_netdev "lan2" "LAN2" "${boardname}:green:lan2" "eth1" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" + ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth0" + ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth1" ;; mobipromo,cm520-79f) - ucidef_set_led_netdev "wan" "WAN" "${boardname}:blue:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "${boardname}:blue:lan1" "switch0" "0x10" - ucidef_set_led_switch "lan2" "LAN2" "${boardname}:blue:lan2" "switch0" "0x08" + 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" ;; netgear,ex6100v2 |\ netgear,ex6150v2) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "ex61x0v2:green:router" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "ex61x0v2:green:client" "phy1tpt" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:client" "phy1tpt" ;; qxwlan,e2600ac-c1 |\ qxwlan,e2600ac-c2) - ucidef_set_led_wlan "wlan2g" "WLAN0" "e2600ac:green:wlan0" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN1" "e2600ac:green:wlan1" "phy1tpt" - ;; -zyxel,nbg6617) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2G" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5G" "phy1tpt" - ;; -edgecore,ecw5211 |\ -zyxel,wre6606) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy1tpt" + ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt" ;; esac diff --git a/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 00000000000..c4f82b35dcf --- /dev/null +++ b/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,19 @@ +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +engenius,emr3500) + migrate_leds "emr3500:=" + ;; +engenius,ens620ext|\ +zyxel,nbg6617) + migrate_leds ":wlan2G=:wlan2g" ":wlan5G=:wlan5g" + ;; +esac + +remove_devicename_leds + +migrations_apply system + +exit 0 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts index 33c44a80976..d866f8dd1a1 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts @@ -105,18 +105,18 @@ compatible = "gpio-leds"; red { - label = "a42:red:status"; + label = "red:status"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-off"; }; power: green { - label = "a42:green:status"; + label = "green:status"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; blue { - label = "a42:blue:status"; + label = "blue:status"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-off"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts index e21c40cae03..28d27d99590 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dts @@ -30,24 +30,24 @@ compatible = "gpio-leds"; status: status { - label = "ap120c-ac:blue:status"; + label = "blue:status"; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; default-state = "keep"; }; wan { - label = "ap120c-ac:amber:wan"; + label = "amber:wan"; gpios = <&qca8075 19 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "ap120c-ac:green:wlan2g"; + label = "green:wlan2g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "ap120c-ac:red:wlan5g"; + label = "red:wlan5g"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts index 2ca2acee192..062826c7a43 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cs-w3-wd1200g-eup.dts @@ -78,17 +78,17 @@ compatible = "gpio-leds"; led_status_red: status_red { - label = "cs-w3-wd1200g-eup:red:status"; + label = "red:status"; gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; }; led_status_green: status_green { - label = "cs-w3-wd1200g-eup:green:status"; + label = "green:status"; gpios = <&tlmm 3 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { - label = "cs-w3-wd1200g-eup:blue:status"; + label = "blue:status"; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 17d9215544b..e3afddb3768 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -67,12 +67,12 @@ compatible = "gpio-leds"; led_red: red { - label = "dap-2610:red:power"; + label = "red:power"; gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; }; led_green: green { - label = "dap-2610:green:power"; + label = "green:power"; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts index 2f9a8904853..cfaba0f4112 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ea6350v3.dts @@ -98,7 +98,7 @@ compatible = "gpio-leds"; power: status { - label = "EA6350v3:green:status"; + label = "green:status"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts index 32fded4c0e3..f08ddd0abe5 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts @@ -78,27 +78,27 @@ compatible = "gpio-leds"; power: orange { - label = "eap1300:orange:power"; + label = "orange:power"; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; lan { - label = "eap1300:blue:lan"; + label = "blue:lan"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; mesh { - label = "eap1300:blue:mesh"; + label = "blue:mesh"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "eap1300:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wlan5g { - label = "eap1300:yellow:wlan5g"; + label = "yellow:wlan5g"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts index 3f7e2ad6fd0..244dfac750c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts @@ -32,17 +32,17 @@ compatible = "gpio-leds"; led_power: power { - label = "ecw5211:yellow:power"; + label = "yellow:power"; gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "ecw5211:green:wlan2g"; + label = "green:wlan2g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wlan5g { - label = "ecw5211:green:wlan5g"; + label = "green:wlan5g"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts index cf4f793f21c..b4058671349 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emd1.dts @@ -81,24 +81,24 @@ compatible = "gpio-leds"; led_power: power { - label = "emd1:white:power"; + label = "white:power"; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "emd1:red:wlan2g"; + label = "red:wlan2g"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "emd1:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; mesh { - label = "emd1:orange:mesh"; + label = "orange:mesh"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts index 50067aaa912..848e5c23638 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts @@ -82,22 +82,22 @@ compatible = "gpio-leds"; power: white { - label = "emr3500:white:power"; + label = "white:power"; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; }; blue { - label = "emr3500:blue"; + label = "blue"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; red { - label = "emr3500:red"; + label = "red"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; }; orange { - label = "emr3500:orange"; + label = "orange"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts index 8636b18b2e8..b765d68b51c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ens620ext.dts @@ -92,27 +92,27 @@ compatible = "gpio-leds"; power: power { - label = "ens620ext:amber:power"; + label = "amber:power"; gpios = <&tlmm 58 GPIO_ACTIVE_LOW>; }; lan1 { - label = "ens620ext:green:lan1"; + label = "green:lan1"; gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; }; lan2 { - label = "ens620ext:green:lan2"; + label = "green:lan2"; gpios = <&tlmm 2 GPIO_ACTIVE_LOW>; }; - wlan2G { - label = "ens620ext:green:wlan2G"; + wlan2g { + label = "green:wlan2g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; - wlan5G { - label = "ens620ext:green:wlan5G"; + wlan5g { + label = "green:wlan5g"; gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi index cc70080c921..c026f70d050 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi @@ -120,47 +120,47 @@ compatible = "gpio-leds"; power_amber: power_amber { - label = "ex61x0v2:amber:power"; + label = "amber:power"; gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>; }; power_green: power_green { - label = "ex61x0v2:green:power"; + label = "green:power"; gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; }; right { - label = "ex61x0v2:blue:right"; + label = "blue:right"; gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>; }; left { - label = "ex61x0v2:blue:left"; + label = "blue:left"; gpios = <&led_gpio 4 GPIO_ACTIVE_LOW>; }; client_green { - label = "ex61x0v2:green:client"; + label = "green:client"; gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>; }; client_red { - label = "ex61x0v2:red:client"; + label = "red:client"; gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>; }; router_green { - label = "ex61x0v2:green:router"; + label = "green:router"; gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>; }; router_red { - label = "ex61x0v2:red:router"; + label = "red:router"; gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>; }; wps { - label = "ex61x0v2:green:wps"; + label = "green:wps"; gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts index b2a32946d94..fb1762cc05d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-fritzbox-4040.dts @@ -109,33 +109,33 @@ compatible = "gpio-leds"; wlan { - label = "fritz4040:green:wlan"; + label = "green:wlan"; gpios = <&qca8075 1 GPIO_ACTIVE_HIGH>; }; panic: info_red { - label = "fritz4040:red:info"; + label = "red:info"; gpios = <&qca8075 3 GPIO_ACTIVE_HIGH>; panic-indicator; }; wan { - label = "fritz4040:green:wan"; + label = "green:wan"; gpios = <&qca8075 5 GPIO_ACTIVE_HIGH>; }; power: power { - label = "fritz4040:green:power"; + label = "green:power"; gpios = <&qca8075 11 GPIO_ACTIVE_HIGH>; }; lan { - label = "fritz4040:green:lan"; + label = "green:lan"; gpios = <&qca8075 13 GPIO_ACTIVE_HIGH>; }; flash: info_amber { - label = "fritz4040:amber:info"; + label = "amber:info"; gpios = <&qca8075 15 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts index 2e21b553254..62ba76802de 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts @@ -74,7 +74,7 @@ compatible = "gpio-leds"; led_status: status { - label = "meshpoint-one:blue:status"; + label = "blue:status"; gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts index a8c144f928e..4d17325c8de 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts @@ -142,29 +142,29 @@ pinctrl-names = "default"; power: power { - label = "nbg6617:green:power"; + label = "green:power"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; usb { - label = "nbg6617:green:usb"; + label = "green:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; - wlan2G { - label = "nbg6617:green:wlan2G"; + wlan2g { + label = "green:wlan2g"; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; }; - wlan5G { - label = "nbg6617:green:wlan5G"; + wlan5g { + label = "green:wlan5g"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; }; wps { - label = "nbg6617:green:wps"; + label = "green:wps"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index a0030f77ce6..bd0c6b71df1 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -118,36 +118,36 @@ compatible = "gpio-leds"; led_power: status { - label = "rt-ac58u:blue:status"; + label = "blue:status"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wan { - label = "rt-ac58u:blue:wan"; + label = "blue:wan"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; wlan2G { - label = "rt-ac58u:blue:wlan2G"; + label = "blue:wlan2G"; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5G { - label = "rt-ac58u:blue:wlan5G"; + label = "blue:wlan5G"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; usb { - label = "rt-ac58u:blue:usb"; + label = "blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; lan { - label = "rt-ac58u:blue:lan"; + label = "blue:lan"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts index 5932638da0d..8fa5a319086 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts @@ -88,32 +88,32 @@ compatible = "gpio-leds"; wps { - label = "wre6606:green:wps"; + label = "green:wps"; gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; }; wlan5g_green { - label = "wre6606:green:wlan5g"; + label = "green:wlan5g"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; power: power { - label = "wre6606:green:power"; + label = "green:power"; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; }; wlan5g_red { - label = "wre6606:red:wlan5g"; + label = "red:wlan5g"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; }; wlan2g_red { - label = "wre6606:red:wlan2g"; + label = "red:wlan2g"; gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; }; wlan2g_green { - label = "wre6606:green:wlan2g"; + label = "green:wlan2g"; gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts index 25bbd6b3321..4c14f41b341 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts @@ -108,18 +108,18 @@ compatible = "gpio-leds"; red { - label = "a62:red:status"; + label = "red:status"; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-off"; }; power: green { - label = "a62:green:status"; + label = "green:status"; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; blue { - label = "a62:blue:status"; + label = "blue:status"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-off"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts index 0a15f003d1e..167094d4a29 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts @@ -130,40 +130,40 @@ compatible = "gpio-leds"; usb { - label = "cm520-79f:blue:usb"; + label = "blue:usb"; gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>; linux,default-trigger = "usbport"; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; }; led_sys: can { - label = "cm520-79f:blue:can"; + label = "blue:can"; gpios = <&tlmm 11 GPIO_ACTIVE_HIGH>; }; wan { - label = "cm520-79f:blue:wan"; + label = "blue:wan"; gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>; }; lan1 { - label = "cm520-79f:blue:lan1"; + label = "blue:lan1"; gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>; }; lan2 { - label = "cm520-79f:blue:lan2"; + label = "blue:lan2"; gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "cm520-79f:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "cm520-79f:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi index f4af2ba25fa..57d607849a1 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-e2600ac.dtsi @@ -132,34 +132,34 @@ compatible = "gpio-leds"; led1 { - label = "e2600ac:green:wlan0"; + label = "green:wlan0"; gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; }; led2 { - label = "e2600ac:green:wlan1"; + label = "green:wlan1"; gpios = <&tlmm 36 GPIO_ACTIVE_LOW>; }; led3 { - label = "e2600ac:green:usb"; + label = "green:usb"; gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; trigger-sources = <&usb2_port1>, <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; led4 { - label = "e2600ac:green:ctrl1"; + label = "green:ctrl1"; gpios = <&tlmm 51 GPIO_ACTIVE_LOW>; }; led5 { - label = "e2600ac:green:ctrl2"; + label = "green:ctrl2"; gpios = <&tlmm 30 GPIO_ACTIVE_LOW>; }; led6 { - label = "e2600ac:green:ctrl3"; + label = "green:ctrl3"; gpios = <&tlmm 31 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts index d8acf36c4a5..5a738da33d3 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ea8300.dts @@ -24,35 +24,35 @@ // Front panel LEDs, top to bottom led_plug: diag { - label = "ea8300:amber:plug"; + label = "amber:plug"; gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; }; led_world: internet { - label = "ea8300:amber:world"; + label = "amber:world"; gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>; }; led_wps: wps { - label = "ea8300:white:wps"; + label = "white:wps"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; led_wps_amber: wps_amber { - label = "ea8300:amber:wps"; + label = "amber:wps"; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_linksys: pwr { - label = "ea8300:white:linksys"; + label = "white:linksys"; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; // On back panel, above USB socket led_usb: usb { - label = "ea8300:green:usb"; + label = "green:usb"; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts index ec3ce447cc7..95e616695cd 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts @@ -29,40 +29,40 @@ compatible = "gpio-leds"; led_power: power { - label = "eap2200:amber:power"; + label = "amber:power"; gpios = <&tlmm 43 GPIO_ACTIVE_LOW>; }; lan1 { - label = "eap2200:blue:lan1"; + label = "blue:lan1"; gpios = <&tlmm 44 GPIO_ACTIVE_LOW>; }; lan2 { - label = "eap2200:blue:lan2"; + label = "blue:lan2"; gpios = <&tlmm 45 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "eap2200:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&tlmm 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "eap2200:yellow:wlan5g"; + label = "yellow:wlan5g"; gpios = <&tlmm 47 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wlan5g2 { - label = "eap2200:yellow:wlan5g2"; + label = "yellow:wlan5g2"; gpios = <&tlmm 48 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy2tpt"; }; mode { - label = "eap2200:blue:mode"; + label = "blue:mode"; gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts index b04a61dc043..dcd336e712c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzbox-7530.dts @@ -101,32 +101,32 @@ compatible = "gpio-leds"; info_red: info_red { - label = "fritzbox-7530:red:info"; + label = "red:info"; gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; }; info_green: info { - label = "fritzbox-7530:green:info"; + label = "green:info"; gpios = <&tlmm 33 GPIO_ACTIVE_LOW>; }; wlan { - label = "fritzbox-7530:green:wlan"; + label = "green:wlan"; gpios = <&tlmm 34 GPIO_ACTIVE_LOW>; }; fon { - label = "fritzbox-7530:green:fon"; + label = "green:fon"; gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; }; power_green: power { - label = "fritzbox-7530:green:power"; + label = "green:power"; gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; }; wps { - label = "fritzbox-7530:green:wps"; + label = "green:wps"; gpios = <&tlmm 45 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts index e9b96b996ab..3d90fdc2865 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-1200.dts @@ -82,17 +82,17 @@ compatible = "gpio-leds"; power_red: power_red { - label = "fritzwlan-1200:red:power"; + label = "red:power"; gpios = <&tlmm 50 GPIO_ACTIVE_LOW>; }; power_green: power_green { - label = "fritzwlan-1200:green:power"; + label = "green:power"; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; power_yellow { - label = "fritzwlan-1200:yellow:power"; + label = "yellow:power"; gpios = <&tlmm 49 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts index 6a132adade8..2e4bfd69bad 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-fritzrepeater-3000.dts @@ -82,22 +82,22 @@ compatible = "gpio-leds"; connect_red { - label = "fritzwlan-3000:red:connect"; + label = "red:connect"; gpios = <&tlmm 30 GPIO_ACTIVE_LOW>; }; connect_green { - label = "fritzwlan-3000:green:connect"; + label = "green:connect"; gpios = <&tlmm 31 GPIO_ACTIVE_LOW>; }; connect_blue { - label = "fritzwlan-3000:blue:connect"; + label = "blue:connect"; gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; }; power_led: power { - label = "fritzwlan-3000:green:power"; + label = "green:power"; gpios = <&tlmm 33 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts index 8fe7644a9b5..49cf2cabfa9 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-habanero-dvk.dts @@ -103,24 +103,24 @@ compatible = "gpio-leds"; led_status: status { - label = "habanero-dvk:green:status"; + label = "green:status"; gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_upgrade: upgrade { - label = "habanero-dvk:green:upgrade"; + label = "green:upgrade"; gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "habanero-dvk:green:wlan2g"; + label = "green:wlan2g"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "habanero-dvk:green:wlan5g"; + label = "green:wlan5g"; gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts index 92aaa927e2a..5b86605daa2 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-map-ac2200.dts @@ -240,63 +240,63 @@ led_blue0: blue0 { chan-name = "blue0"; - label = "map-ac2200:blue:chan0"; + label = "blue:chan0"; led-cur = [fa]; max-cur = [ff]; }; blue1 { chan-name = "blue1"; - label = "map-ac2200:blue:chan1"; + label = "blue:chan1"; led-cur = [fa]; max-cur = [ff]; }; blue2 { chan-name = "blue2"; - label = "map-ac2200:blue:chan2"; + label = "blue:chan2"; led-cur = [fa]; max-cur = [ff]; }; led_green0: green0 { chan-name = "green0"; - label = "map-ac2200:green:chan0"; + label = "green:chan0"; led-cur = [fa]; max-cur = [ff]; }; green1 { chan-name = "green1"; - label = "map-ac2200:green:chan1"; + label = "green:chan1"; led-cur = [fa]; max-cur = [ff]; }; green2 { chan-name = "green2"; - label = "map-ac2200:green:chan2"; + label = "green:chan2"; led-cur = [fa]; max-cur = [ff]; }; led_red0: red0 { chan-name = "red0"; - label = "map-ac2200:red:chan0"; + label = "red:chan0"; led-cur = [fa]; max-cur = [ff]; }; red1 { chan-name = "red1"; - label = "map-ac2200:red:chan1"; + label = "red:chan1"; led-cur = [fa]; max-cur = [ff]; }; red2 { chan-name = "red2"; - label = "map-ac2200:red:chan2"; + label = "red:chan2"; led-cur = [fa]; max-cur = [ff]; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts index a09730a9e88..057aa880285 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mr8300.dts @@ -19,25 +19,25 @@ compatible = "gpio-leds"; led_red: red { - label = "mr8300:red:alarm"; + label = "red:alarm"; gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; }; led_amber: amber { - label = "mr8300:amber:programming"; + label = "amber:programming"; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; panic-indicator; }; led_blue: blue { - label = "mr8300:blue:power"; + label = "blue:power"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; // On back panel, above USB socket led_usb: usb { - label = "mr8300:green:usb"; + label = "green:usb"; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts index 2a92a5d80f5..69423ce02be 100755 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-oap100.dts @@ -125,17 +125,17 @@ compatible = "gpio-leds"; led_system: led_system { - label = "oap100:green:system"; + label = "green:system"; gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>; }; led_2g { - label = "oap100:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>; }; led_5g { - label = "oap100:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts index 2f17424e552..0caa0255d03 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts @@ -48,72 +48,72 @@ led_power_blue: power_blue { gpios = <&led_gpio 0 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:power"; + label = "blue:power"; default-state = "on"; }; led_power_red: power_red { gpios = <&led_gpio 1 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:red:power"; + label = "red:power"; }; tp28 { gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>; - label = "rtl30vw:ext:tp28"; + label = "ext:tp28"; default-state = "keep"; }; tp27 { gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>; - label = "rtl30vw:ext:tp27"; + label = "ext:tp27"; default-state = "keep"; }; wlan2g { gpios = <&led_gpio 8 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:wlan2g"; + label = "blue:wlan2g"; linux,default-trigger = "phy0tpt"; }; wlan5g { gpios = <&led_gpio 9 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:wlan5g"; + label = "blue:wlan5g"; linux,default-trigger = "phy1tpt"; }; wps { gpios = <&led_gpio 10 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:wps"; + label = "blue:wps"; }; voip { gpios = <&led_gpio 11 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:voip"; + label = "blue:voip"; }; s1 { gpios = <&led_gpio 12 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:s1"; + label = "blue:s1"; }; s2 { gpios = <&led_gpio 13 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:s2"; + label = "blue:s2"; }; s3 { gpios = <&led_gpio 14 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:s3"; + label = "blue:s3"; }; s4 { gpios = <&led_gpio 15 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:blue:s4"; + label = "blue:s4"; }; signal { gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; - label = "rtl30vw:red:signal"; + label = "red:signal"; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi index c768e25ca00..4435d1fd283 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-u4019.dtsi @@ -110,7 +110,7 @@ pinctrl-names = "default"; led_status: led2 { - label = "u4019:green:led2"; + label = "green:led2"; gpios = <&tlmm 68 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts index 1977358525b..cdf0cfe6445 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts @@ -95,47 +95,47 @@ compatible = "gpio-leds"; led_power_white: power_white { - label = "wtr-m2133hp:white:power"; + label = "white:power"; gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; }; led_power_orange: power_orange { - label = "wtr-m2133hp:orange:power"; + label = "orange:power"; gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; }; led_power_blue: power_blue { - label = "wtr-m2133hp:blue:power"; + label = "blue:power"; gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>; }; router_white { - label = "wtr-m2133hp:white:router"; + label = "white:router"; gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; }; router_orange { - label = "wtr-m2133hp:orange:router"; + label = "orange:router"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; internet_white { - label = "wtr-m2133hp:white:internet"; + label = "white:internet"; gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>; }; internet_orange { - label = "wtr-m2133hp:orange:internet"; + label = "orange:internet"; gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; }; wireless_white { - label = "wtr-m2133hp:white:wireless"; + label = "white:wireless"; gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>; }; wireless_orange { - label = "wtr-m2133hp:orange:wireless"; + label = "orange:wireless"; gpios = <&tlmm 44 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts index 1bcf5e80bf3..79f4c04edf0 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts @@ -116,12 +116,12 @@ compatible = "gpio-leds"; status: rss4 { - label = "wpj428:green:rss4"; + label = "green:rss4"; gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; }; rss3 { - label = "wpj428:green:rss3"; + label = "green:rss3"; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts index 00faa9840dc..a3cecddd6ee 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts @@ -18,24 +18,24 @@ compatible = "gpio-leds"; wifi_green { - label = "ap-303:green:wifi"; + label = "green:wifi"; gpios = <&tlmm 39 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wifi_amber { - label = "ap-303:amber:wifi"; + label = "amber:wifi"; gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; led_system_red: system_red { - label = "ap-303:red:system"; + label = "red:system"; gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>; }; led_system_green: system_green { - label = "ap-303:green:system"; + label = "green:system"; gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index c48bfb636a3..707ed18e3b9 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -108,34 +108,34 @@ compatible = "gpio-leds"; wifi_green { - label = "ap-303h:green:wifi"; + label = "green:wifi"; gpios = <&tlmm 27 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wifi_amber { - label = "ap-303h:amber:wifi"; + label = "amber:wifi"; gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; pse { - label = "ap-303h:green:pse"; + label = "green:pse"; gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>; }; led_system_red: system_red { - label = "ap-303h:red:system"; + label = "red:system"; gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; }; led_system_green: system_green { - label = "ap-303h:green:system"; + label = "green:system"; gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>; }; led_system_amber: system_amber { - label = "ap-303h:amber:system"; + label = "amber:system"; gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts index c743ac4b4d6..1d4e50292e6 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; led_system_red: system_red { - label = "ap-365:red:system"; + label = "red:system"; gpios = <&tlmm 46 GPIO_ACTIVE_LOW>; }; led_system_green: system_green { - label = "ap-365:green:system"; + label = "green:system"; gpios = <&tlmm 61 GPIO_ACTIVE_LOW>; }; system_amber { - label = "ap-365:amber:system"; + label = "amber:system"; gpios = <&tlmm 49 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts index b32eb29f8ca..a735d8e3aca 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts @@ -121,18 +121,18 @@ compatible = "gpio-leds"; power: power { - label = "gl-b1300:green:power"; + label = "green:power"; gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>; default-state = "on"; }; mesh { - label = "gl-b1300:green:mesh"; + label = "green:mesh"; gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; }; wlan { - label = "gl-b1300:green:wlan"; + label = "green:wlan"; gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts index b18e2515a3f..fa859b73a35 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-s1300.dts @@ -107,18 +107,18 @@ compatible = "gpio-leds"; led_power: power { - label = "gl-s1300:green:power"; + label = "green:power"; gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>; default-state = "on"; }; mesh { - label = "gl-s1300:green:mesh"; + label = "green:mesh"; gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>; }; wlan { - label = "gl-s1300:green:wlan"; + label = "green:wlan"; gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-mr33.dts index 71057c75776..36a01e50535 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-mr33.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-mr33.dts @@ -117,7 +117,7 @@ compatible = "gpio-leds"; power_orange: power { - label = "mr33:orange:power"; + label = "orange:power"; gpios = <&tlmm 49 GPIO_ACTIVE_LOW>; panic-indicator; }; @@ -169,25 +169,25 @@ /* RGB led */ status_red: chan0 { - chan-name = "mr33:red:status"; + chan-name = "red:status"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; }; status_green: chan1 { - chan-name = "mr33:green:status"; + chan-name = "green:status"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; }; chan2 { - chan-name = "mr33:blue:status"; + chan-name = "blue:status"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; }; chan3 { - chan-name = "mr33:white:status"; + chan-name = "white:status"; led-cur = /bits/ 8 <0x20>; max-cur = /bits/ 8 <0x60>; };