diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b251526c7d..c9146d6374 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.19 = .138 -LINUX_VERSION-5.4 = .68 +LINUX_VERSION-5.4 = .69 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 -LINUX_KERNEL_HASH-5.4.68 = 0e93876c5ae8dc0c55cbe631971a46ab02b90cf7461fed3085703a5e4e3cd6dd +LINUX_KERNEL_HASH-5.4.69 = a8b31d716b397303a183e42ad525ff2871024a43e3ea530d0fdf73b7f9d27da7 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/include/netfilter.mk b/include/netfilter.mk index a1147dec19..8e1eedd5c6 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -346,11 +346,11 @@ $(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nf # nftables $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES, $(P_XT)nf_tables),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_SET, $(P_XT)nf_tables_set),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4, lt 5.2),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6, lt 5.2),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr, lt 4.18),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log),)) @@ -366,13 +366,14 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_BRIDGE,CONFIG_NFT_BRIDGE_META, $(P_EBT) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_BRIDGE,CONFIG_NFT_BRIDGE_REJECT, $(P_EBT)nft_reject_bridge),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_nat),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_chain_nat, ge 5.1),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4, lt 5.1),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_REDIR_IPV4, $(P_V4)nft_redir_ipv4),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_MASQ, $(P_XT)nft_masq),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_MASQ_IPV4, $(P_V4)nft_masq_ipv4),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_REDIR_IPV6, $(P_V6)nft_redir_ipv6),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6, lt 5.1),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_MASQ_IPV6, $(P_V6)nft_masq_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_FIB,CONFIG_NFT_FIB, $(P_XT)nft_fib),)) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index db9be216e6..bf6b5c3c9a 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=230 +PKG_RELEASE:=232 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh index b180a0242f..d2f1bc19aa 100644 --- a/package/base-files/files/lib/functions/migrations.sh +++ b/package/base-files/files/lib/functions/migrations.sh @@ -28,11 +28,41 @@ migrate_led_sysfs() { done; } +remove_devicename_led_sysfs() { + local cfg="$1"; shift + local exceptions="$@" + local sysfs + local name + local new_sysfs + + config_get sysfs ${cfg} sysfs + config_get name ${cfg} name + + # only continue if two or more colons are present + echo "${sysfs}" | grep -q ":.*:" || return + + for exception in ${exceptions}; do + # no change if exceptions provided as argument are found for devicename + echo "${sysfs}" | grep -q "^${exception}:" && return + done + + new_sysfs=$(echo ${sysfs} | sed "s/^[^:]*://") + + uci set system.${cfg}.sysfs="${new_sysfs}" + + logger -t led-migration "sysfs option of LED \"${name}\" updated to ${new_sysfs}" +} + migrate_leds() { config_load system config_foreach migrate_led_sysfs led "$@" } +remove_devicename_leds() { + config_load system + config_foreach remove_devicename_led_sysfs led "$@" +} + migrations_apply() { local realm="$1" [ -n "$(uci changes ${realm})" ] && uci -q commit ${realm} diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile index 294045288b..39dcf82be7 100644 --- a/package/boot/uboot-layerscape/Makefile +++ b/package/boot/uboot-layerscape/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-layerscape PKG_VERSION:=LSDK-20.04 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot diff --git a/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt index f33e6a3f5c..b0923b5922 100644 --- a/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt +++ b/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt @@ -1,6 +1,6 @@ fdtaddr=0x8f000000 loadaddr=0x81000000 -fdt_high=0xffffffffffffffff +fdt_high=0x8fffffff initrd_high=0xffffffffffffffff qspi_boot=sf probe 0:0;sf read $loadaddr 1000000 2800000;bootm $loadaddr bootargs=rootfstype=squashfs,jffs2 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.spi:1m(bl2),4m(fip),1m(u-boot-env),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),-(firmware) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 8a7232d8be..373c9fbaab 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -65,7 +65,7 @@ define KernelPackage/ata-ahci-platform $(LINUX_DIR)/drivers/ata/ahci_platform.ko \ $(LINUX_DIR)/drivers/ata/libahci_platform.ko AUTOLOAD:=$(call AutoLoad,40,libahci libahci_platform ahci_platform,1) - $(call AddDepends/ata,@TARGET_ipq806x||TARGET_sunxi) + $(call AddDepends/ata,@TARGET_ipq806x||TARGET_layerscape||TARGET_sunxi) endef define KernelPackage/ata-ahci-platform/description diff --git a/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts b/target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts index 89ddf12998..f0d262c847 100644 --- 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 bc20d70eed..787b516056 100644 --- 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 733479ff4e..e34c304b47 100644 --- 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 17e42d7ba0..344241a322 100644 --- 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 d7f1a0711f..65c0be073b 100644 --- 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 1a509d864e..053c91557b 100644 --- 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 c67b94b117..85fd54b396 100644 --- 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 abcecd0406..8a27452eb8 100644 --- 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 fa7e607288..afc49ce865 100644 --- 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 db47126623..9e41b61357 100644 --- 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 22ae58929c..3c1d97f25e 100644 --- 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 16407128ab..cd0e5015a9 100644 --- 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 576f84d88c..e93c5ca652 100644 --- 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 511216838c..b632d3b8a8 100644 --- 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 d8f98ba6c0..4752ad1edd 100644 --- 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 ec0001b867..d67af04d1c 100644 --- 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 f3d06b5fd5..44dbe9c55e 100644 --- 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 7e54cd46b1..23d12e4edf 100644 --- 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 7ec0469dcd..e0ac582f9d 100644 --- 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 5ceada8375..bd6caacdf6 100644 --- 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 1b303711a8..1b124f3f2e 100644 --- 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 ec4dd871cc..62614166db 100644 --- 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 3cbedc3bf8..62884f0902 100644 --- 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 9d0f34924f..af8e297b1d 100644 --- 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 e39f2ee3f9..cae2f5477d 100644 --- 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 9d4f3f2027..218ea5e429 100644 --- 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 cc138cd59f..17e06dfac7 100644 --- 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 c02154a902..b0f6c3695a 100644 --- 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 db192cd30b..fcc66c018c 100644 --- 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 963c241d81..c4c0235f7b 100644 --- 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 c4af52a76a..3a002aaedf 100644 --- 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 46d7e0f331..3b2dc0ecfc 100644 --- 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 89e77224ca..2840f91ec1 100644 --- 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 1a3aec00fa..f035f86c7c 100644 --- 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 8bf89e4ecd..4f186c2c11 100644 --- 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 0ac10a56f9..dd4cbf03eb 100644 --- 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 43b24dae5a..52e83ea8d0 100644 --- 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 a28f8fbcd4..eab08d1d74 100644 --- 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 662ffa2e5c..c8697d193d 100644 --- 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 3ff992a841..e17303a0fb 100644 --- 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 a35dbc2d1a..ad517d8baf 100644 --- 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 b0d68fb35f..15e29f552e 100644 --- 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 389c6d1e4b..26b3b3f04c 100644 --- 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 a551a4a4f4..7d04b01377 100644 --- 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 de6d9f85d7..85e70495fc 100644 --- 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 bfb6d3152c..0465109bc3 100644 --- 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 74d65d828a..50605bf685 100644 --- 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"; + }; + }; }; ð0 { diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts b/target/linux/ath79/dts/ar9331_alfa-network_ap121fe.dts index 178a32f4d0..873e92cdfb 100644 --- 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 e00a8c638e..8ce5beb059 100644 --- 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 d0f9f9b724..9303121408 100644 --- 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 9df6de1685..0d7b7cfb84 100644 --- 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 c96aaa2222..8cdc9ac4ca 100644 --- 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 ead81adc55..d62bdd9d67 100644 --- 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 8b9ece07ef..6a756ed30b 100644 --- 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 d19214d3f4..787dbed9c7 100644 --- 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 0a9cf9566f..6bc0773b9b 100644 --- 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 40ebcccd2b..8632011de3 100644 --- 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 812b5b0ec7..cdc92f697d 100644 --- 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 5ea2569fed..7c52ae1617 100644 --- 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 2c8dddbe5e..da04aad6cb 100644 --- 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 236609d958..4ea658713d 100644 --- 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 b8a4fe96b5..db43484112 100644 --- 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 ed120b4776..c1d88f4812 100644 --- 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 354e276f7b..da1e59d4c3 100644 --- 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 d3fd4f114b..7eafd1acd4 100644 --- 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 685afa5b74..7057c3b1ad 100644 --- 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 dc97b103a4..f229a1917e 100644 --- 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 460277c077..750522ded1 100644 --- 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 b3de436e92..12755aea2f 100644 --- 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 36abbb1c31..9f540f82d9 100644 --- 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 420d03861f..4a4e51f4b8 100644 --- 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 0932fe9da2..cb6b25e664 100644 --- 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 bd088a39cf..58845f4cb6 100644 --- 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 38cd058134..6f6e4c6bb6 100644 --- 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 4fcb7cd139..6114650ac5 100644 --- 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 68b608a017..7e4b9cd415 100644 --- 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 a0012a7461..ff4e177ca8 100644 --- 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 c3ac486471..aed25e2f67 100644 --- 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 26d9a33a93..75893a5e33 100644 --- 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 0bbde9ebfd..95f798cc0f 100644 --- 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 c2dfa6ba2d..a6a4811053 100644 --- 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 59ec9451fc..a35c177b3c 100644 --- 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 2c242a1b0a..bd4c58f3c9 100644 --- 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 17c58073d5..189945848d 100644 --- 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 35d6c55b59..26e98f8711 100644 --- 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 e95ffc787a..789069632b 100644 --- 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 ad9caa690e..92b0beccd7 100644 --- 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 e3780632e9..0ca3b761bf 100644 --- 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 91c2971f8c..da6020769f 100644 --- 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 428f35cd2f..443f0c6724 100644 --- 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 5a1ac21025..c5919b5ef8 100644 --- 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 9886c3dee5..3ab1cb34b3 100644 --- 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 9d1cd52440..dff2644b11 100644 --- 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 3ae68d6104..8a04af2973 100644 --- 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 7a5bda64c5..f61f2bf628 100644 --- 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 b158d8709a..98ad19cdeb 100644 --- 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 3b89b77412..c495eb298c 100644 --- 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 346c2aa19f..fa533d9f50 100644 --- 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 be29d944b2..a1dca81093 100644 --- 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 089114f21b..1fce869160 100644 --- 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 af992249f6..59a06346ae 100644 --- 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 fd9f2b48ca..21fd079e1a 100644 --- 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 68d79a6745..e7430988ad 100644 --- 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 c0b0f0bd41..da3b0c63aa 100644 --- 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 00ae776f04..c440d71721 100644 --- 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 77e0a0b20f..6bacee4b4d 100644 --- 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 c897b23015..cd2e389ccd 100644 --- 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 58780a0417..fd587c5da0 100644 --- 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 8dd91ab38b..40eabd0488 100644 --- 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 0405e40839..2588b10d73 100644 --- 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 ac1df6bf68..749acedcda 100644 --- 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 a7c2571fda..7e2ff5d0ee 100644 --- 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 ff975567d1..723c9eda13 100644 --- 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 d5711334fd..5c69a9bde0 100644 --- 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 847dae6895..46b08da838 100644 --- 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 ad5275c0a1..f52467c4e2 100644 --- 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 467dfaeb15..2fbdc8fd07 100644 --- 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 4b4e23e1aa..2cc9d46fac 100644 --- 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 b3fc8ea0bf..dafce16a2a 100644 --- 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 5ca651cfc4..eb91d7e0b4 100644 --- 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 5a92d83669..cf531ed8c4 100644 --- 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 617076b074..86c895fc6a 100644 --- 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 1bc41839d1..57a7ed1a0c 100644 --- 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 f423e709f9..acb458f7ec 100644 --- 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 98b52a7b24..455bfb336f 100644 --- 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 65b85a78f1..f6bd7ad58f 100644 --- 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 92da0b1a5e..2f6c4147c9 100644 --- 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 6ab63ebde0..bd3858e59a 100644 --- 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 e6fc128229..a162d9030f 100644 --- 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 a31e24b7cc..777a55b6f3 100644 --- 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 4a0fa49474..aaa9e1f908 100644 --- 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 7643717c0e..961caa8ade 100644 --- 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 9b3a66f703..5002079940 100644 --- 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 f54e757c62..5448b7beb0 100644 --- 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 5edd2adc83..3295776bf9 100644 --- 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 2722c59b0e..1d8098944a 100644 --- 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 387bd6ba1d..7c64dcc24f 100644 --- 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 efe892e288..c45280aff0 100644 --- 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 537c577918..7d8519ef9b 100644 --- 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 8bb708c6b6..b6349e5371 100644 --- 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 a0d0afcccf..027ed82cbe 100644 --- 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 e85f37f425..b68cd87e98 100644 --- 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 25447b8bff..269ca03645 100644 --- 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 6c1d583f01..091d6696a3 100644 --- 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 43bf582b5a..bdb983cd7c 100644 --- 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 86cd7153e3..0d30535976 100644 --- 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 28b19f92ef..bf1c026d17 100644 --- 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 d629c751de..33053771ad 100644 --- 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 d4aa0d742a..f19e186796 100644 --- 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 e259cb0266..9a938aff30 100644 --- 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 2054643302..1e7d92db3f 100644 --- 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 388bd3ef09..af2607d7b7 100644 --- 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 5898518f20..d56fab120b 100644 --- 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 d825eb005b..1cca39de38 100644 --- 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 d04f61193a..240d20ff1f 100644 --- 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 6edd75d61a..1b20c3b615 100644 --- 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 b57bcc3942..5d32551274 100644 --- 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 3164d783ff..6efdfcab3c 100644 --- 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 11ac6fd18f..4ef43be4ba 100644 --- 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 11325a69c8..1cf5c09d72 100644 --- 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 7de8ee0bdb..6a6228327f 100644 --- 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 7ba011faf2..59a9f4c523 100644 --- 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 a113097f62..8352b37f4a 100644 --- 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 2cd05d9159..f0cf22511a 100644 --- 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 776e92ceec..4af1860aca 100644 --- 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 e4e3ca3409..5e38f2e459 100644 --- 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 aa14fd4f3f..9d37664306 100644 --- 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 ccead91cfc..c4a73f2563 100644 --- 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 222de88784..d1f307bd48 100644 --- 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 3936fd993e..34cc35735f 100644 --- 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 57aeedd677..70b3ee68c3 100644 --- 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 bbecdfce83..04abb8717e 100644 --- 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 eefa839b88..dbefa40dcf 100644 --- 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 eb93201ab0..8c7a7af91b 100644 --- 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 51a22f09a2..eb196eb2e5 100644 --- 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 0b191149cd..412a6e7b33 100644 --- 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 83458df56d..d59d87b5e6 100644 --- 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 c8381296c1..9ffbce0a21 100644 --- 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 ee35fa6599..e2d1d63813 100644 --- 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 634c23c356..be99b8e3e4 100644 --- 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 6d7e0dd5e6..598c5570aa 100644 --- 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 3e57326e0b..11ebbdacea 100644 --- 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 0c11d786c9..55f4edf19e 100644 --- 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 70e14c4ebe..9f241ebc2f 100644 --- 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 6173a5ca75..476162a00e 100644 --- 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 82dee361bc..bbbf69fa59 100644 --- 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 881e3c88ab..871b69af78 100644 --- 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 5dd06803e7..94991a8f49 100644 --- 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 e05f4bb45f..e7e421c076 100644 --- 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 02f54097f3..6659bbe688 100644 --- 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 fe8569c427..4430d05247 100644 --- 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 2d62944421..c407dc3cde 100644 --- 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 a5933d27e7..9ba6ccfafd 100644 --- 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 a46b537d3e..2a6bea30f2 100644 --- 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 5c8564154c..afef276db2 100644 --- 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 67cef957c9..cda2a3615b 100644 --- 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 9c46a1b222..7ba94aa42e 100644 --- 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 0e93e06e2f..21203451cb 100644 --- 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 077724d4b9..a403877c89 100644 --- 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 a85f99881c..913155a0bd 100644 --- 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 754d5fad1c..02a3e3e44a 100644 --- 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 / { + 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 de7ad15cc7..23f912df32 100644 --- 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 de0e554b7b..1a62764a92 100644 --- 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 6954a330dc..e43113ad5f 100644 --- 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 0197921ec4..572a0bc6ea 100644 --- 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 c4450fea1a..b4f7718230 100644 --- 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 18074c72b4..3af6f59d09 100644 --- 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 ebe4a0ff52..7efdfa62af 100644 --- 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 762cc895ea..24b0860d7c 100644 --- 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 d5a14ab470..0f77cfa5f1 100644 --- 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 607db3ca22..befd1620e9 100644 --- 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 173dfdd557..ca29336147 100644 --- 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 07e2ad0548..8682413b0b 100644 --- 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 d5cd01eac4..6e25215501 100644 --- 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 94a10d45f7..e89a4de1ee 100644 --- 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 d37e1aed37..ce73d0838f 100644 --- 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 2ef5bee281..95ac123f48 100644 --- 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 d09ee56d53..399f410612 100644 --- 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 9f4386c2c2..d00320ad02 100644 --- 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 5f66570013..77ba6c4ffb 100644 --- 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 7f79165cb4..63c9977c6c 100644 --- 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 321b6296d1..184c208f58 100644 --- 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 ed8d90710e..85b9cf6a10 100644 --- 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 49fa914bd3..0ce1da832c 100644 --- 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 2704d4c8cd..b8f48047e2 100644 --- 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 7603898def..2f2d59ebd3 100644 --- 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 51cefa3f34..7a5a957f7b 100644 --- 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 3774b75365..5a84195bfb 100644 --- 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 5865e9526b..05032fc955 100644 --- 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 992c14842b..6b27468551 100644 --- 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 dcb450a2d3..5c897b16a0 100644 --- 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 88aff2c4cc..21a2be993c 100644 --- 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 5a6e65464a..4334b70ce8 100644 --- 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 b3df5610f2..306b5d436d 100755 --- 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" - ;; -avm,fritz4020) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" - ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x1E" - ;; -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" - ;; -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_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" - ;; -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_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" - ;; -comfast,cf-e130n-v2) - ucidef_set_led_netdev "lan" "LAN" "$boardname: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" - ;; -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_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" - ;; -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_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" - ;; -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_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" - ;; -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" - ;; -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" - ;; -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" - ;; -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" - ;; -devolo,magic-2-wifi) - ucidef_set_led_netdev "plcw" "dLAN" "devolo: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" - ;; -dlink,dir-859-a1) - ucidef_set_led_switch "internet" "WAN" "$boardname: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_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" - ;; -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" - ;; -engenius,ews511ap) - ucidef_set_led_netdev "lan1" "LAN1" "$boardname:blue:lan1" "eth1" - ucidef_set_led_netdev "lan2" "LAN2" "$boardname: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" - ;; -glinet,gl-mifi) - ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x02" - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" - ;; -glinet,gl-x750) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1" - ;; -hak5,lan-turtle) - ucidef_set_led_netdev "wan" "WAN" "$boardname:orange:system" "eth1" - ;; -meraki,mr16) - ucidef_set_led_netdev "wan" "WAN" "$boardname: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" - ;; -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" - ;; -qihoo,c301) - ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" - ;; -samsung,wam250) - ucidef_set_led_netdev "lan" "LAN" "$boardname: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" - ;; -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" - ;; -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" - ;; -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" + 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|\ 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_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" "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" "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" "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" "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" "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" "green:lan" "eth0" + ucidef_set_rssimon "wlan0" "200000" "1" + 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" "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" "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" "green:wan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1" + ucidef_set_rssimon "wlan0" "200000" "1" + 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" "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" "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" "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" "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" "blue:lan" "eth0" + ;; +compex,wpj344-16m|\ +compex,wpj531-16m) + ucidef_set_rssimon "wlan0" "200000" "1" + 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" "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" "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" "green:internet" "switch0" "0x20" + ;; +engenius,enh202-v1) + 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" "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" "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" "blue:lan1" "eth1" + ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "eth0" + ;; +etactica,eg200) + 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" "green:lan" "switch0" "0x02" + ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" + ;; +glinet,gl-x750) + ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" + ;; +hak5,lan-turtle) + ucidef_set_led_netdev "wan" "WAN" "orange:system" "eth1" + ;; +meraki,mr16) + ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" + ;; +netgear,wnr2200-8m|\ +netgear,wnr2200-16m) + 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" "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" "green:wlan" "phy0tpt" + ;; +samsung,wam250) + 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" "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" "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" "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" "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,47 +349,47 @@ 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" ;; xwrt,csac) ucidef_set_led_wlan "wlan5g" "WLAN5G" "xwrt:blue:wlan5g" "phy1tpt" ucidef_set_led_wlan "wlan2g" "WLAN2G" "xwrt:blue:wlan2g" "phy0tpt" ;; 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 15cf20573b..f439e9ccc7 100644 --- 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 6085830595..60dcef4ff6 100755 --- 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 c12a7ac02c..281d6ac0bc 100644 --- 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 4f601849fc..8eda666a81 100755 --- 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/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration similarity index 51% rename from target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration rename to target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration index 1009154cac..281d6ac0bc 100644 --- a/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ath79/nand/base-files/etc/uci-defaults/04_led_migration @@ -4,14 +4,10 @@ board=$(board_name) case "$board" in -fon,fonera-20n) - migrate_leds "^fonera20n:=fonera-20n:" - ;; -intenso,memory2move) - migrate_leds "^m2m:=memory2move:" - ;; 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 bc0b15bba5..26926b6f64 100755 --- 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 377135f530..9850ed2293 100644 --- 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 diff --git a/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch b/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch index d7bc3d709d..d8bb3bfbf6 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0447-PCI-of-Add-inbound-resource-parsing-to-helpers.patch @@ -402,7 +402,7 @@ Cc: linux-rockchip@lists.infradead.org } --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -2278,6 +2278,7 @@ struct irq_domain; +@@ -2277,6 +2277,7 @@ struct irq_domain; struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus); int pci_parse_request_of_pci_ranges(struct device *dev, struct list_head *resources, @@ -410,7 +410,7 @@ Cc: linux-rockchip@lists.infradead.org struct resource **bus_range); /* Arch may override this (weak) */ -@@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_n +@@ -2285,9 +2286,11 @@ struct device_node *pcibios_get_phb_of_n #else /* CONFIG_OF */ static inline struct irq_domain * pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0564-drm-vc4-crtc-Rename-HDMI-encoder-type-to-HDMI0.patch b/target/linux/bcm27xx/patches-5.4/950-0564-drm-vc4-crtc-Rename-HDMI-encoder-type-to-HDMI0.patch index 17362dafe3..fa6a8f9a63 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0564-drm-vc4-crtc-Rename-HDMI-encoder-type-to-HDMI0.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0564-drm-vc4-crtc-Rename-HDMI-encoder-type-to-HDMI0.patch @@ -38,7 +38,7 @@ Signed-off-by: Maxime Ripard VC4_ENCODER_TYPE_DSI1, --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1319,7 +1319,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1320,7 +1320,7 @@ static int vc4_hdmi_bind(struct device * GFP_KERNEL); if (!vc4_hdmi_encoder) return -ENOMEM; diff --git a/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch b/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch index 71125e3e25..ebe6432913 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0572-drm-vc4-hdmi-rework-connectors-and-encoders.patch @@ -180,7 +180,7 @@ Signed-off-by: Maxime Ripard return 0; } -@@ -1230,7 +1229,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1231,7 +1230,7 @@ static int vc4_hdmi_bind(struct device * struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; struct vc4_hdmi *hdmi; @@ -189,7 +189,7 @@ Signed-off-by: Maxime Ripard struct device_node *ddc_node; u32 value; int ret; -@@ -1239,14 +1238,10 @@ static int vc4_hdmi_bind(struct device * +@@ -1240,14 +1239,10 @@ static int vc4_hdmi_bind(struct device * if (!hdmi) return -ENOMEM; @@ -207,7 +207,7 @@ Signed-off-by: Maxime Ripard hdmi->hdmicore_regs = vc4_ioremap_regs(pdev, 0); if (IS_ERR(hdmi->hdmicore_regs)) return PTR_ERR(hdmi->hdmicore_regs); -@@ -1332,15 +1327,14 @@ static int vc4_hdmi_bind(struct device * +@@ -1333,15 +1328,14 @@ static int vc4_hdmi_bind(struct device * } pm_runtime_enable(dev); @@ -228,7 +228,7 @@ Signed-off-by: Maxime Ripard #ifdef CONFIG_DRM_VC4_HDMI_CEC hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4, "vc4", -@@ -1350,7 +1344,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1351,7 +1345,7 @@ static int vc4_hdmi_bind(struct device * if (ret < 0) goto err_destroy_conn; @@ -237,7 +237,7 @@ Signed-off-by: Maxime Ripard cec_s_conn_info(hdmi->cec_adap, &conn_info); HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); -@@ -1387,10 +1381,10 @@ static int vc4_hdmi_bind(struct device * +@@ -1388,10 +1382,10 @@ static int vc4_hdmi_bind(struct device * err_delete_cec_adap: cec_delete_adapter(hdmi->cec_adap); err_destroy_conn: @@ -250,7 +250,7 @@ Signed-off-by: Maxime Ripard err_unprepare_hsm: clk_disable_unprepare(hdmi->hsm_clock); pm_runtime_disable(dev); -@@ -1408,8 +1402,8 @@ static void vc4_hdmi_unbind(struct devic +@@ -1409,8 +1403,8 @@ static void vc4_hdmi_unbind(struct devic struct vc4_hdmi *hdmi = vc4->hdmi; cec_unregister_adapter(hdmi->cec_adap); diff --git a/target/linux/bcm27xx/patches-5.4/950-0573-drm-vc4-hdmi-Rename-hdmi-to-vc4_hdmi.patch b/target/linux/bcm27xx/patches-5.4/950-0573-drm-vc4-hdmi-Rename-hdmi-to-vc4_hdmi.patch index 75c44a564a..19296e93ee 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0573-drm-vc4-hdmi-Rename-hdmi-to-vc4_hdmi.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0573-drm-vc4-hdmi-Rename-hdmi-to-vc4_hdmi.patch @@ -401,7 +401,7 @@ Signed-off-by: Maxime Ripard dai_link->num_cpus = 1; dai_link->num_codecs = 1; -@@ -1058,7 +1058,7 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1059,7 +1059,7 @@ static int vc4_hdmi_audio_init(struct vc * now stored in card->drvdata and should be retrieved with * snd_soc_card_get_drvdata() if needed. */ @@ -410,7 +410,7 @@ Signed-off-by: Maxime Ripard ret = devm_snd_soc_register_card(dev, card); if (ret) dev_err(dev, "Could not register sound card: %d\n", ret); -@@ -1071,20 +1071,21 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1072,20 +1072,21 @@ static int vc4_hdmi_audio_init(struct vc static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) { struct vc4_dev *vc4 = priv; @@ -439,7 +439,7 @@ Signed-off-by: Maxime Ripard 0, 2, 0, 0); } return IRQ_HANDLED; -@@ -1110,23 +1111,23 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1111,23 +1112,23 @@ static void vc4_cec_read_msg(struct vc4_ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { struct vc4_dev *vc4 = priv; @@ -468,7 +468,7 @@ Signed-off-by: Maxime Ripard cntrl1 &= ~VC4_HDMI_CEC_START_XMIT_BEGIN; } HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1); -@@ -1228,44 +1229,44 @@ static int vc4_hdmi_bind(struct device * +@@ -1229,44 +1230,44 @@ static int vc4_hdmi_bind(struct device * struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; @@ -538,7 +538,7 @@ Signed-off-by: Maxime Ripard } ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); -@@ -1274,9 +1275,9 @@ static int vc4_hdmi_bind(struct device * +@@ -1275,9 +1276,9 @@ static int vc4_hdmi_bind(struct device * return -ENODEV; } @@ -550,7 +550,7 @@ Signed-off-by: Maxime Ripard DRM_DEBUG("Failed to get ddc i2c adapter by node\n"); return -EPROBE_DEFER; } -@@ -1285,13 +1286,13 @@ static int vc4_hdmi_bind(struct device * +@@ -1286,13 +1287,13 @@ static int vc4_hdmi_bind(struct device * * needs to be a bit higher than the pixel clock rate * (generally 148.5Mhz). */ @@ -566,7 +566,7 @@ Signed-off-by: Maxime Ripard if (ret) { DRM_ERROR("Failed to turn on HDMI state machine clock: %d\n", ret); -@@ -1304,18 +1305,18 @@ static int vc4_hdmi_bind(struct device * +@@ -1305,18 +1306,18 @@ static int vc4_hdmi_bind(struct device * if (of_find_property(dev->of_node, "hpd-gpios", &value)) { enum of_gpio_flags hpd_gpio_flags; @@ -590,7 +590,7 @@ Signed-off-by: Maxime Ripard /* HDMI core must be enabled. */ if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) { -@@ -1331,21 +1332,21 @@ static int vc4_hdmi_bind(struct device * +@@ -1332,21 +1333,21 @@ static int vc4_hdmi_bind(struct device * DRM_MODE_ENCODER_TMDS, NULL); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); @@ -617,7 +617,7 @@ Signed-off-by: Maxime Ripard HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); value = HDMI_READ(VC4_HDMI_CEC_CNTRL_1); -@@ -1364,32 +1365,32 @@ static int vc4_hdmi_bind(struct device * +@@ -1365,32 +1366,32 @@ static int vc4_hdmi_bind(struct device * "vc4 hdmi cec", vc4); if (ret) goto err_delete_cec_adap; @@ -657,7 +657,7 @@ Signed-off-by: Maxime Ripard return ret; } -@@ -1399,16 +1400,16 @@ static void vc4_hdmi_unbind(struct devic +@@ -1400,16 +1401,16 @@ static void vc4_hdmi_unbind(struct devic { struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; diff --git a/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch b/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch index 53296ecb4b..1e50c0c579 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch @@ -100,7 +100,7 @@ Signed-off-by: Maxime Ripard switch (cmd) { case SNDRV_PCM_TRIGGER_START: -@@ -1093,7 +1083,8 @@ static irqreturn_t vc4_cec_irq_handler_t +@@ -1094,7 +1084,8 @@ static irqreturn_t vc4_cec_irq_handler_t static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1) { @@ -110,7 +110,7 @@ Signed-off-by: Maxime Ripard unsigned int i; msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> -@@ -1139,6 +1130,7 @@ static irqreturn_t vc4_cec_irq_handler(i +@@ -1140,6 +1131,7 @@ static irqreturn_t vc4_cec_irq_handler(i static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) { struct vc4_dev *vc4 = cec_get_drvdata(adap); @@ -118,7 +118,7 @@ Signed-off-by: Maxime Ripard /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); -@@ -1182,6 +1174,7 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1183,6 +1175,7 @@ static int vc4_hdmi_cec_adap_enable(stru static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { struct vc4_dev *vc4 = cec_get_drvdata(adap); @@ -126,7 +126,7 @@ Signed-off-by: Maxime Ripard HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) | -@@ -1193,6 +1186,7 @@ static int vc4_hdmi_cec_adap_transmit(st +@@ -1194,6 +1187,7 @@ static int vc4_hdmi_cec_adap_transmit(st u32 signal_free_time, struct cec_msg *msg) { struct vc4_dev *vc4 = cec_get_drvdata(adap); diff --git a/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch b/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch index b0abafc699..092efc17f5 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch @@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1043,8 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1044,8 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc #ifdef CONFIG_DRM_VC4_HDMI_CEC static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) { @@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard if (vc4_hdmi->cec_irq_was_rx) { if (vc4_hdmi->cec_rx_msg.len) -@@ -1064,9 +1063,8 @@ static irqreturn_t vc4_cec_irq_handler_t +@@ -1065,9 +1064,8 @@ static irqreturn_t vc4_cec_irq_handler_t return IRQ_HANDLED; } @@ -38,7 +38,7 @@ Signed-off-by: Maxime Ripard struct cec_msg *msg = &vc4_hdmi->cec_rx_msg; unsigned int i; -@@ -1084,8 +1082,7 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1085,8 +1083,7 @@ static void vc4_cec_read_msg(struct vc4_ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { @@ -48,7 +48,7 @@ Signed-off-by: Maxime Ripard u32 stat = HDMI_READ(VC4_HDMI_CPU_STATUS); u32 cntrl1, cntrl5; -@@ -1096,7 +1093,7 @@ static irqreturn_t vc4_cec_irq_handler(i +@@ -1097,7 +1094,7 @@ static irqreturn_t vc4_cec_irq_handler(i cntrl5 = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); vc4_hdmi->cec_irq_was_rx = cntrl5 & VC4_HDMI_CEC_RX_CEC_INT; if (vc4_hdmi->cec_irq_was_rx) { @@ -57,7 +57,7 @@ Signed-off-by: Maxime Ripard cntrl1 |= VC4_HDMI_CEC_CLEAR_RECEIVE_OFF; HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1); cntrl1 &= ~VC4_HDMI_CEC_CLEAR_RECEIVE_OFF; -@@ -1112,8 +1109,7 @@ static irqreturn_t vc4_cec_irq_handler(i +@@ -1113,8 +1110,7 @@ static irqreturn_t vc4_cec_irq_handler(i static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable) { @@ -67,7 +67,7 @@ Signed-off-by: Maxime Ripard /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5); -@@ -1156,8 +1152,7 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1157,8 +1153,7 @@ static int vc4_hdmi_cec_adap_enable(stru static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { @@ -77,7 +77,7 @@ Signed-off-by: Maxime Ripard HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) | -@@ -1168,8 +1163,7 @@ static int vc4_hdmi_cec_adap_log_addr(st +@@ -1169,8 +1164,7 @@ static int vc4_hdmi_cec_adap_log_addr(st static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 signal_free_time, struct cec_msg *msg) { @@ -87,7 +87,7 @@ Signed-off-by: Maxime Ripard u32 val; unsigned int i; -@@ -1315,7 +1309,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1316,7 +1310,7 @@ static int vc4_hdmi_bind(struct device * #ifdef CONFIG_DRM_VC4_HDMI_CEC vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, @@ -96,7 +96,7 @@ Signed-off-by: Maxime Ripard CEC_CAP_DEFAULTS | CEC_CAP_CONNECTOR_INFO, 1); ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap); -@@ -1339,7 +1333,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1340,7 +1334,7 @@ static int vc4_hdmi_bind(struct device * ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, vc4_cec_irq_handler_thread, 0, diff --git a/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch b/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch index ff9fa1a158..24e4229c0e 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0578-drm-vc4-hdmi-Remove-vc4_dev-hdmi-pointer.patch @@ -23,7 +23,7 @@ Signed-off-by: Maxime Ripard struct vc4_dpi *dpi; --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1199,7 +1199,6 @@ static int vc4_hdmi_bind(struct device * +@@ -1200,7 +1200,6 @@ static int vc4_hdmi_bind(struct device * #endif struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); @@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard struct vc4_hdmi *vc4_hdmi; struct drm_encoder *encoder; struct device_node *ddc_node; -@@ -1287,8 +1286,6 @@ static int vc4_hdmi_bind(struct device * +@@ -1288,8 +1287,6 @@ static int vc4_hdmi_bind(struct device * vc4_hdmi->hpd_active_low = hpd_gpio_flags & OF_GPIO_ACTIVE_LOW; } @@ -40,7 +40,7 @@ Signed-off-by: Maxime Ripard /* HDMI core must be enabled. */ if (!(HD_READ(VC4_HD_M_CTL) & VC4_HD_M_ENABLE)) { HD_WRITE(VC4_HD_M_CTL, VC4_HD_M_SW_RST); -@@ -1369,9 +1366,12 @@ err_put_i2c: +@@ -1370,9 +1367,12 @@ err_put_i2c: static void vc4_hdmi_unbind(struct device *dev, struct device *master, void *data) { @@ -56,7 +56,7 @@ Signed-off-by: Maxime Ripard cec_unregister_adapter(vc4_hdmi->cec_adap); vc4_hdmi_connector_destroy(&vc4_hdmi->connector.base); -@@ -1381,8 +1381,6 @@ static void vc4_hdmi_unbind(struct devic +@@ -1382,8 +1382,6 @@ static void vc4_hdmi_unbind(struct devic pm_runtime_disable(dev); put_device(&vc4_hdmi->ddc->dev); diff --git a/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Remove-vc4_hdmi_connector.patch b/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Remove-vc4_hdmi_connector.patch index 4ef3d69b2c..15d15c6afe 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Remove-vc4_hdmi_connector.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0579-drm-vc4-hdmi-Remove-vc4_hdmi_connector.patch @@ -66,7 +66,7 @@ Signed-off-by: Maxime Ripard memcpy(ucontrol->value.bytes.data, connector->eld, sizeof(connector->eld)); -@@ -1313,7 +1310,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1314,7 +1311,7 @@ static int vc4_hdmi_bind(struct device * if (ret < 0) goto err_destroy_conn; @@ -75,7 +75,7 @@ Signed-off-by: Maxime Ripard cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); -@@ -1350,7 +1347,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1351,7 +1348,7 @@ static int vc4_hdmi_bind(struct device * err_delete_cec_adap: cec_delete_adapter(vc4_hdmi->cec_adap); err_destroy_conn: @@ -84,7 +84,7 @@ Signed-off-by: Maxime Ripard #endif err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); -@@ -1374,7 +1371,7 @@ static void vc4_hdmi_unbind(struct devic +@@ -1375,7 +1372,7 @@ static void vc4_hdmi_unbind(struct devic struct vc4_hdmi *vc4_hdmi = snd_soc_card_get_drvdata(card); cec_unregister_adapter(vc4_hdmi->cec_adap); diff --git a/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch b/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch index 82fae40246..c3a4a76bad 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0580-drm-vc4-hdmi-Introduce-resource-init-and-variant.patch @@ -18,7 +18,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1189,38 +1189,23 @@ static const struct cec_adap_ops vc4_hdm +@@ -1190,38 +1190,23 @@ static const struct cec_adap_ops vc4_hdm }; #endif @@ -64,7 +64,7 @@ Signed-off-by: Maxime Ripard vc4_hdmi->hd_regset.base = vc4_hdmi->hd_regs; vc4_hdmi->hd_regset.regs = hd_regs; vc4_hdmi->hd_regset.nregs = ARRAY_SIZE(hd_regs); -@@ -1230,12 +1215,44 @@ static int vc4_hdmi_bind(struct device * +@@ -1231,12 +1216,44 @@ static int vc4_hdmi_bind(struct device * DRM_ERROR("Failed to get pixel clock\n"); return PTR_ERR(vc4_hdmi->pixel_clock); } @@ -109,7 +109,7 @@ Signed-off-by: Maxime Ripard ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); if (!ddc_node) { DRM_ERROR("Failed to find ddc node in device tree\n"); -@@ -1396,8 +1413,12 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1397,8 +1414,12 @@ static int vc4_hdmi_dev_remove(struct pl return 0; } diff --git a/target/linux/bcm27xx/patches-5.4/950-0581-drm-vc4-hdmi-Implement-a-register-layout-abstraction.patch b/target/linux/bcm27xx/patches-5.4/950-0581-drm-vc4-hdmi-Implement-a-register-layout-abstraction.patch index eaeca92bfd..dbfb08eebb 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0581-drm-vc4-hdmi-Implement-a-register-layout-abstraction.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0581-drm-vc4-hdmi-Implement-a-register-layout-abstraction.patch @@ -525,7 +525,7 @@ Signed-off-by: Maxime Ripard vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; vc4_hdmi->audio.dma_data.maxburst = 2; -@@ -1068,7 +1031,7 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1069,7 +1032,7 @@ static void vc4_cec_read_msg(struct vc4_ msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> VC4_HDMI_CEC_REC_WRD_CNT_SHIFT); for (i = 0; i < msg->len; i += 4) { @@ -534,7 +534,7 @@ Signed-off-by: Maxime Ripard msg->msg[i] = val & 0xff; msg->msg[i + 1] = (val >> 8) & 0xff; -@@ -1080,26 +1043,26 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1081,26 +1044,26 @@ static void vc4_cec_read_msg(struct vc4_ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv) { struct vc4_hdmi *vc4_hdmi = priv; @@ -567,7 +567,7 @@ Signed-off-by: Maxime Ripard return IRQ_WAKE_THREAD; } -@@ -1109,7 +1072,7 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1110,7 +1073,7 @@ static int vc4_hdmi_cec_adap_enable(stru struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); /* clock period in microseconds */ const u32 usecs = 1000000 / CEC_CLOCK_FREQ; @@ -576,7 +576,7 @@ Signed-off-by: Maxime Ripard val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET | VC4_HDMI_CEC_CNT_TO_4700_US_MASK | -@@ -1118,30 +1081,30 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1119,30 +1082,30 @@ static int vc4_hdmi_cec_adap_enable(stru ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT); if (enable) { @@ -615,7 +615,7 @@ Signed-off-by: Maxime Ripard VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); } return 0; -@@ -1151,8 +1114,8 @@ static int vc4_hdmi_cec_adap_log_addr(st +@@ -1152,8 +1115,8 @@ static int vc4_hdmi_cec_adap_log_addr(st { struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); @@ -626,7 +626,7 @@ Signed-off-by: Maxime Ripard (log_addr & 0xf) << VC4_HDMI_CEC_ADDR_SHIFT); return 0; } -@@ -1165,20 +1128,20 @@ static int vc4_hdmi_cec_adap_transmit(st +@@ -1166,20 +1129,20 @@ static int vc4_hdmi_cec_adap_transmit(st unsigned int i; for (i = 0; i < msg->len; i += 4) @@ -651,7 +651,7 @@ Signed-off-by: Maxime Ripard return 0; } -@@ -1189,26 +1152,63 @@ static const struct cec_adap_ops vc4_hdm +@@ -1190,26 +1153,63 @@ static const struct cec_adap_ops vc4_hdm }; #endif @@ -721,7 +721,7 @@ Signed-off-by: Maxime Ripard vc4_hdmi->pixel_clock = devm_clk_get(dev, "pixel"); if (IS_ERR(vc4_hdmi->pixel_clock)) { -@@ -1301,12 +1301,12 @@ static int vc4_hdmi_bind(struct device * +@@ -1302,12 +1302,12 @@ static int vc4_hdmi_bind(struct device * } /* HDMI core must be enabled. */ @@ -738,7 +738,7 @@ Signed-off-by: Maxime Ripard } pm_runtime_enable(dev); -@@ -1330,8 +1330,8 @@ static int vc4_hdmi_bind(struct device * +@@ -1331,8 +1331,8 @@ static int vc4_hdmi_bind(struct device * cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); @@ -749,7 +749,7 @@ Signed-off-by: Maxime Ripard value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK; /* * Set the logical address to Unregistered and set the clock -@@ -1340,7 +1340,7 @@ static int vc4_hdmi_bind(struct device * +@@ -1341,7 +1341,7 @@ static int vc4_hdmi_bind(struct device * */ value |= VC4_HDMI_CEC_ADDR_MASK | (4091 << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT); @@ -758,7 +758,7 @@ Signed-off-by: Maxime Ripard ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, vc4_cec_irq_handler_thread, 0, -@@ -1387,6 +1387,9 @@ static void vc4_hdmi_unbind(struct devic +@@ -1388,6 +1388,9 @@ static void vc4_hdmi_unbind(struct devic struct snd_soc_card *card = dev_get_drvdata(dev); struct vc4_hdmi *vc4_hdmi = snd_soc_card_get_drvdata(card); @@ -768,7 +768,7 @@ Signed-off-by: Maxime Ripard cec_unregister_adapter(vc4_hdmi->cec_adap); vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_encoder_destroy(&vc4_hdmi->encoder.base.base); -@@ -1414,6 +1417,9 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1415,6 +1418,9 @@ static int vc4_hdmi_dev_remove(struct pl } static const struct vc4_hdmi_variant bcm2835_variant = { diff --git a/target/linux/bcm27xx/patches-5.4/950-0582-drm-vc4-hdmi-Add-reset-callback.patch b/target/linux/bcm27xx/patches-5.4/950-0582-drm-vc4-hdmi-Add-reset-callback.patch index 53dd3e4405..18c11aba45 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0582-drm-vc4-hdmi-Add-reset-callback.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0582-drm-vc4-hdmi-Add-reset-callback.patch @@ -44,7 +44,7 @@ Signed-off-by: Maxime Ripard /* PHY should be in reset, like * vc4_hdmi_encoder_disable() does. -@@ -1421,6 +1427,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1422,6 +1428,7 @@ static const struct vc4_hdmi_variant bcm .num_registers = ARRAY_SIZE(vc4_hdmi_fields), .init_resources = vc4_hdmi_init_resources, diff --git a/target/linux/bcm27xx/patches-5.4/950-0583-drm-vc4-hdmi-Add-PHY-init-and-disable-function.patch b/target/linux/bcm27xx/patches-5.4/950-0583-drm-vc4-hdmi-Add-PHY-init-and-disable-function.patch index 6db26d40aa..ce295f3fce 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0583-drm-vc4-hdmi-Add-PHY-init-and-disable-function.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0583-drm-vc4-hdmi-Add-PHY-init-and-disable-function.patch @@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard if (debug_dump_regs) { struct drm_printer p = drm_info_printer(&vc4_hdmi->pdev->dev); -@@ -1428,6 +1426,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1429,6 +1427,8 @@ static const struct vc4_hdmi_variant bcm .init_resources = vc4_hdmi_init_resources, .reset = vc4_hdmi_reset, diff --git a/target/linux/bcm27xx/patches-5.4/950-0584-drm-vc4-hdmi-Add-PHY-RNG-enable-disable-function.patch b/target/linux/bcm27xx/patches-5.4/950-0584-drm-vc4-hdmi-Add-PHY-RNG-enable-disable-function.patch index cea17a621e..0fb6a63bcc 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0584-drm-vc4-hdmi-Add-PHY-RNG-enable-disable-function.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0584-drm-vc4-hdmi-Add-PHY-RNG-enable-disable-function.patch @@ -42,7 +42,7 @@ Signed-off-by: Maxime Ripard break; default: break; -@@ -1428,6 +1429,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1429,6 +1430,8 @@ static const struct vc4_hdmi_variant bcm .reset = vc4_hdmi_reset, .phy_init = vc4_hdmi_phy_init, .phy_disable = vc4_hdmi_phy_disable, diff --git a/target/linux/bcm27xx/patches-5.4/950-0585-drm-vc4-hdmi-Add-a-CSC-setup-callback.patch b/target/linux/bcm27xx/patches-5.4/950-0585-drm-vc4-hdmi-Add-a-CSC-setup-callback.patch index c9650bca08..0106470d93 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0585-drm-vc4-hdmi-Add-a-CSC-setup-callback.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0585-drm-vc4-hdmi-Add-a-CSC-setup-callback.patch @@ -112,7 +112,7 @@ Signed-off-by: Maxime Ripard HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N); if (debug_dump_regs) { -@@ -1426,6 +1438,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1427,6 +1439,7 @@ static const struct vc4_hdmi_variant bcm .num_registers = ARRAY_SIZE(vc4_hdmi_fields), .init_resources = vc4_hdmi_init_resources, diff --git a/target/linux/bcm27xx/patches-5.4/950-0586-drm-vc4-hdmi-Add-a-set_timings-callback.patch b/target/linux/bcm27xx/patches-5.4/950-0586-drm-vc4-hdmi-Add-a-set_timings-callback.patch index a39a8ac109..064925c61a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0586-drm-vc4-hdmi-Add-a-set_timings-callback.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0586-drm-vc4-hdmi-Add-a-set_timings-callback.patch @@ -110,7 +110,7 @@ Signed-off-by: Maxime Ripard if (vc4_encoder->hdmi_monitor && drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) { -@@ -1440,6 +1448,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1441,6 +1449,7 @@ static const struct vc4_hdmi_variant bcm .init_resources = vc4_hdmi_init_resources, .csc_setup = vc4_hdmi_csc_setup, .reset = vc4_hdmi_reset, diff --git a/target/linux/bcm27xx/patches-5.4/950-0587-drm-vc4-hdmi-Add-HDMI-ID.patch b/target/linux/bcm27xx/patches-5.4/950-0587-drm-vc4-hdmi-Add-HDMI-ID.patch index b6de732379..b5d9c7b340 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0587-drm-vc4-hdmi-Add-HDMI-ID.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0587-drm-vc4-hdmi-Add-HDMI-ID.patch @@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1267,11 +1267,10 @@ static int vc4_hdmi_bind(struct device * +@@ -1268,11 +1268,10 @@ static int vc4_hdmi_bind(struct device * vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); if (!vc4_hdmi) return -ENOMEM; diff --git a/target/linux/bcm27xx/patches-5.4/950-0588-drm-vc4-hdmi-Deal-with-multiple-debugfs-files.patch b/target/linux/bcm27xx/patches-5.4/950-0588-drm-vc4-hdmi-Deal-with-multiple-debugfs-files.patch index 746eff91d5..e25b18a21f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0588-drm-vc4-hdmi-Deal-with-multiple-debugfs-files.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0588-drm-vc4-hdmi-Deal-with-multiple-debugfs-files.patch @@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1380,7 +1380,10 @@ static int vc4_hdmi_bind(struct device * +@@ -1381,7 +1381,10 @@ static int vc4_hdmi_bind(struct device * if (ret) goto err_destroy_encoder; diff --git a/target/linux/bcm27xx/patches-5.4/950-0589-drm-vc4-hdmi-Add-an-audio-support-flag.patch b/target/linux/bcm27xx/patches-5.4/950-0589-drm-vc4-hdmi-Add-an-audio-support-flag.patch index cc6cd86887..9c8240714a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0589-drm-vc4-hdmi-Add-an-audio-support-flag.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0589-drm-vc4-hdmi-Add-an-audio-support-flag.patch @@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard if (!of_find_property(dev->of_node, "dmas", &len) || len == 0) { dev_warn(dev, -@@ -1444,6 +1447,7 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1445,6 +1448,7 @@ static int vc4_hdmi_dev_remove(struct pl } static const struct vc4_hdmi_variant bcm2835_variant = { diff --git a/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch b/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch index 533eb89e7a..a3efadd2ad 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0590-drm-vc4-hdmi-Move-CEC-init-to-its-own-function.patch @@ -14,7 +14,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1178,6 +1178,67 @@ static const struct cec_adap_ops vc4_hdm +@@ -1179,6 +1179,67 @@ static const struct cec_adap_ops vc4_hdm .adap_log_addr = vc4_hdmi_cec_adap_log_addr, .adap_transmit = vc4_hdmi_cec_adap_transmit, }; @@ -82,7 +82,7 @@ Signed-off-by: Maxime Ripard #endif static int vc4_hdmi_build_regset(struct vc4_hdmi *vc4_hdmi, -@@ -1255,9 +1316,6 @@ static int vc4_hdmi_init_resources(struc +@@ -1256,9 +1317,6 @@ static int vc4_hdmi_init_resources(struc static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) { @@ -92,7 +92,7 @@ Signed-off-by: Maxime Ripard struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); const struct vc4_hdmi_variant *variant; -@@ -1345,43 +1403,13 @@ static int vc4_hdmi_bind(struct device * +@@ -1346,43 +1404,13 @@ static int vc4_hdmi_bind(struct device * if (ret) goto err_destroy_encoder; @@ -139,7 +139,7 @@ Signed-off-by: Maxime Ripard vc4_debugfs_add_file(drm, variant->id ? "hdmi1_regs" : "hdmi_regs", -@@ -1390,12 +1418,10 @@ static int vc4_hdmi_bind(struct device * +@@ -1391,12 +1419,10 @@ static int vc4_hdmi_bind(struct device * return 0; @@ -154,7 +154,7 @@ Signed-off-by: Maxime Ripard err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); err_unprepare_hsm: -@@ -1420,7 +1446,7 @@ static void vc4_hdmi_unbind(struct devic +@@ -1421,7 +1447,7 @@ static void vc4_hdmi_unbind(struct devic kfree(vc4_hdmi->hdmi_regset.regs); kfree(vc4_hdmi->hd_regset.regs); diff --git a/target/linux/bcm27xx/patches-5.4/950-0591-drm-vc4-hdmi-Add-CEC-support-flag.patch b/target/linux/bcm27xx/patches-5.4/950-0591-drm-vc4-hdmi-Add-CEC-support-flag.patch index 33ecf44a27..396e8a5523 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0591-drm-vc4-hdmi-Add-CEC-support-flag.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0591-drm-vc4-hdmi-Add-CEC-support-flag.patch @@ -15,7 +15,7 @@ Signed-off-by: Maxime Ripard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1186,6 +1186,9 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1187,6 +1187,9 @@ static int vc4_hdmi_cec_init(struct vc4_ u32 value; int ret; @@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", CEC_CAP_DEFAULTS | -@@ -1474,6 +1477,7 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1475,6 +1478,7 @@ static int vc4_hdmi_dev_remove(struct pl static const struct vc4_hdmi_variant bcm2835_variant = { .audio_available = true, diff --git a/target/linux/bcm27xx/patches-5.4/950-0594-drm-vc4-hdmi-Adjust-HSM-clock-rate-depending-on-pixe.patch b/target/linux/bcm27xx/patches-5.4/950-0594-drm-vc4-hdmi-Adjust-HSM-clock-rate-depending-on-pixe.patch index 4dba81b035..5b836f8bf8 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0594-drm-vc4-hdmi-Adjust-HSM-clock-rate-depending-on-pixe.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0594-drm-vc4-hdmi-Adjust-HSM-clock-rate-depending-on-pixe.patch @@ -99,7 +99,7 @@ Signed-off-by: Maxime Ripard return MODE_CLOCK_HIGH; return MODE_OK; -@@ -1353,23 +1373,6 @@ static int vc4_hdmi_bind(struct device * +@@ -1354,23 +1374,6 @@ static int vc4_hdmi_bind(struct device * return -EPROBE_DEFER; } @@ -123,7 +123,7 @@ Signed-off-by: Maxime Ripard /* Only use the GPIO HPD pin if present in the DT, otherwise * we'll use the HDMI core's register. */ -@@ -1427,9 +1430,7 @@ err_destroy_conn: +@@ -1428,9 +1431,7 @@ err_destroy_conn: err_destroy_encoder: vc4_hdmi_encoder_destroy(encoder); err_unprepare_hsm: @@ -133,7 +133,7 @@ Signed-off-by: Maxime Ripard put_device(&vc4_hdmi->ddc->dev); return ret; -@@ -1452,7 +1453,6 @@ static void vc4_hdmi_unbind(struct devic +@@ -1453,7 +1454,6 @@ static void vc4_hdmi_unbind(struct devic vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_encoder_destroy(&vc4_hdmi->encoder.base.base); @@ -141,7 +141,7 @@ Signed-off-by: Maxime Ripard pm_runtime_disable(dev); put_device(&vc4_hdmi->ddc->dev); -@@ -1475,6 +1475,7 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1476,6 +1476,7 @@ static int vc4_hdmi_dev_remove(struct pl } static const struct vc4_hdmi_variant bcm2835_variant = { diff --git a/target/linux/bcm27xx/patches-5.4/950-0595-drm-vc4-hdmi-Support-the-BCM2711-HDMI-controllers.patch b/target/linux/bcm27xx/patches-5.4/950-0595-drm-vc4-hdmi-Support-the-BCM2711-HDMI-controllers.patch index d511f1e212..8a2772299a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0595-drm-vc4-hdmi-Support-the-BCM2711-HDMI-controllers.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0595-drm-vc4-hdmi-Support-the-BCM2711-HDMI-controllers.patch @@ -175,7 +175,7 @@ Signed-off-by: Maxime Ripard static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) { struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; -@@ -1336,6 +1460,92 @@ static int vc4_hdmi_init_resources(struc +@@ -1337,6 +1461,92 @@ static int vc4_hdmi_init_resources(struc return 0; } @@ -268,7 +268,7 @@ Signed-off-by: Maxime Ripard static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); -@@ -1491,8 +1701,52 @@ static const struct vc4_hdmi_variant bcm +@@ -1492,8 +1702,52 @@ static const struct vc4_hdmi_variant bcm .phy_rng_disable = vc4_hdmi_phy_rng_disable, }; diff --git a/target/linux/bcm27xx/patches-5.4/950-0610-drm-vc4-Add-audio-initialisation-for-Pi4.patch b/target/linux/bcm27xx/patches-5.4/950-0610-drm-vc4-Add-audio-initialisation-for-Pi4.patch index 6ec6850866..4388099671 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0610-drm-vc4-Add-audio-initialisation-for-Pi4.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0610-drm-vc4-Add-audio-initialisation-for-Pi4.patch @@ -83,7 +83,7 @@ Signed-off-by: Dave Stevenson HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map); HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config); vc4_hdmi_set_n_cts(vc4_hdmi); -@@ -1715,6 +1744,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1716,6 +1745,8 @@ static const struct vc4_hdmi_variant bcm .phy_disable = vc4_hdmi_phy_disable, .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, @@ -92,7 +92,7 @@ Signed-off-by: Dave Stevenson }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { -@@ -1736,6 +1767,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1737,6 +1768,8 @@ static const struct vc4_hdmi_variant bcm .phy_init = vc5_hdmi_phy_init, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, @@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { -@@ -1757,6 +1790,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1758,6 +1791,8 @@ static const struct vc4_hdmi_variant bcm .phy_init = vc5_hdmi_phy_init, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, diff --git a/target/linux/bcm27xx/patches-5.4/950-0611-drm-vc4-Enable-audio-on-Pi4.patch b/target/linux/bcm27xx/patches-5.4/950-0611-drm-vc4-Enable-audio-on-Pi4.patch index 78340ced70..b07a815df4 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0611-drm-vc4-Enable-audio-on-Pi4.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0611-drm-vc4-Enable-audio-on-Pi4.patch @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1750,6 +1750,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1751,6 +1751,7 @@ static const struct vc4_hdmi_variant bcm static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .id = 0, @@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson .max_pixel_clock = 297000000, .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), -@@ -1773,6 +1774,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1774,6 +1775,7 @@ static const struct vc4_hdmi_variant bcm static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .id = 1, diff --git a/target/linux/bcm27xx/patches-5.4/950-0612-drm-vc4-Alter-the-HDMI-state-machine-clock-calc-to-a.patch b/target/linux/bcm27xx/patches-5.4/950-0612-drm-vc4-Alter-the-HDMI-state-machine-clock-calc-to-a.patch index f576b8624e..dc2d1a2a04 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0612-drm-vc4-Alter-the-HDMI-state-machine-clock-calc-to-a.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0612-drm-vc4-Alter-the-HDMI-state-machine-clock-calc-to-a.patch @@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson ret = clk_set_rate(vc4_hdmi->hsm_clock, hsm_rate); if (ret) { DRM_ERROR("Failed to set HSM clock rate: %d\n", ret); -@@ -1730,7 +1731,7 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1731,7 +1732,7 @@ static int vc4_hdmi_dev_remove(struct pl } static const struct vc4_hdmi_variant bcm2835_variant = { diff --git a/target/linux/bcm27xx/patches-5.4/950-0617-drm-vc4-hdmi-Give-the-HDMI-audio-instances-different.patch b/target/linux/bcm27xx/patches-5.4/950-0617-drm-vc4-hdmi-Give-the-HDMI-audio-instances-different.patch index a7b5b5fad3..aff182dbec 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0617-drm-vc4-hdmi-Give-the-HDMI-audio-instances-different.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0617-drm-vc4-hdmi-Give-the-HDMI-audio-instances-different.patch @@ -22,5 +22,5 @@ Signed-off-by: Dave Stevenson - card->name = "vc4-hdmi"; + card->name = vc4_hdmi->variant->id ? "vc4-hdmi1" : "vc4-hdmi"; card->dev = dev; + card->owner = THIS_MODULE; - /* diff --git a/target/linux/bcm27xx/patches-5.4/950-0641-drm-vc4-hdmi-Silence-pixel-clock-error-on-EPROBE_DEF.patch b/target/linux/bcm27xx/patches-5.4/950-0641-drm-vc4-hdmi-Silence-pixel-clock-error-on-EPROBE_DEF.patch index 1b1cb143ae..0580fc8b93 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0641-drm-vc4-hdmi-Silence-pixel-clock-error-on-EPROBE_DEF.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0641-drm-vc4-hdmi-Silence-pixel-clock-error-on-EPROBE_DEF.patch @@ -14,7 +14,7 @@ Signed-off-by: James Hilliard --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1493,8 +1493,10 @@ static int vc4_hdmi_init_resources(struc +@@ -1494,8 +1494,10 @@ static int vc4_hdmi_init_resources(struc vc4_hdmi->pixel_clock = devm_clk_get(dev, "pixel"); if (IS_ERR(vc4_hdmi->pixel_clock)) { diff --git a/target/linux/bcm27xx/patches-5.4/950-0682-vc4_hdmi-BCM2835-requires-a-fixed-hsm-clock-for-CEC-.patch b/target/linux/bcm27xx/patches-5.4/950-0682-vc4_hdmi-BCM2835-requires-a-fixed-hsm-clock-for-CEC-.patch index 0ea80ae6c8..e5ffc3e96f 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0682-vc4_hdmi-BCM2835-requires-a-fixed-hsm-clock-for-CEC-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0682-vc4_hdmi-BCM2835-requires-a-fixed-hsm-clock-for-CEC-.patch @@ -55,7 +55,7 @@ Signed-off-by: popcornmix static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) { int i; -@@ -1748,6 +1765,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1749,6 +1766,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, .get_hsm_clock = vc4_hdmi_get_hsm_clock, @@ -63,7 +63,7 @@ Signed-off-by: popcornmix .channel_map = vc4_hdmi_channel_map, }; -@@ -1772,6 +1790,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1773,6 +1791,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .get_hsm_clock = vc5_hdmi_get_hsm_clock, @@ -71,7 +71,7 @@ Signed-off-by: popcornmix .channel_map = vc5_hdmi_channel_map, }; -@@ -1796,6 +1815,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1797,6 +1816,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .get_hsm_clock = vc5_hdmi_get_hsm_clock, diff --git a/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch b/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch index d6aa46a4f4..d192565145 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch @@ -11,7 +11,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1264,8 +1264,13 @@ static void vc4_cec_read_msg(struct vc4_ +@@ -1265,8 +1265,13 @@ static void vc4_cec_read_msg(struct vc4_ msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >> VC4_HDMI_CEC_REC_WRD_CNT_SHIFT); @@ -26,7 +26,7 @@ Signed-off-by: Dom Cobley msg->msg[i] = val & 0xff; msg->msg[i + 1] = (val >> 8) & 0xff; -@@ -1361,8 +1366,12 @@ static int vc4_hdmi_cec_adap_transmit(st +@@ -1362,8 +1367,12 @@ static int vc4_hdmi_cec_adap_transmit(st u32 val; unsigned int i; diff --git a/target/linux/bcm27xx/patches-5.4/950-0712-vc4_hdmi_regs-Add-Intr2-register-block.patch b/target/linux/bcm27xx/patches-5.4/950-0712-vc4_hdmi_regs-Add-Intr2-register-block.patch index d750e55abb..e3299acf9d 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0712-vc4_hdmi_regs-Add-Intr2-register-block.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0712-vc4_hdmi_regs-Add-Intr2-register-block.patch @@ -69,7 +69,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1581,6 +1581,14 @@ static int vc5_hdmi_init_resources(struc +@@ -1582,6 +1582,14 @@ static int vc5_hdmi_init_resources(struc if (IS_ERR(vc4_hdmi->dvp_regs)) return PTR_ERR(vc4_hdmi->dvp_regs); diff --git a/target/linux/bcm27xx/patches-5.4/950-0713-vc4_hdmi_regs-Make-interrupt-mask-variant-specific.patch b/target/linux/bcm27xx/patches-5.4/950-0713-vc4_hdmi_regs-Make-interrupt-mask-variant-specific.patch index b92d1dbac9..f2a30c6443 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0713-vc4_hdmi_regs-Make-interrupt-mask-variant-specific.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0713-vc4_hdmi_regs-Make-interrupt-mask-variant-specific.patch @@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1285,7 +1285,7 @@ static irqreturn_t vc4_cec_irq_handler(i +@@ -1286,7 +1286,7 @@ static irqreturn_t vc4_cec_irq_handler(i u32 stat = HDMI_READ(HDMI_CEC_CPU_STATUS); u32 cntrl1, cntrl5; @@ -21,7 +21,7 @@ Signed-off-by: Dom Cobley return IRQ_NONE; vc4_hdmi->cec_rx_msg.len = 0; cntrl1 = HDMI_READ(HDMI_CEC_CNTRL_1); -@@ -1301,7 +1301,7 @@ static irqreturn_t vc4_cec_irq_handler(i +@@ -1302,7 +1302,7 @@ static irqreturn_t vc4_cec_irq_handler(i cntrl1 &= ~VC4_HDMI_CEC_START_XMIT_BEGIN; } HDMI_WRITE(HDMI_CEC_CNTRL_1, cntrl1); @@ -30,7 +30,7 @@ Signed-off-by: Dom Cobley return IRQ_WAKE_THREAD; } -@@ -1340,9 +1340,9 @@ static int vc4_hdmi_cec_adap_enable(stru +@@ -1341,9 +1341,9 @@ static int vc4_hdmi_cec_adap_enable(stru ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) | ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT)); @@ -42,7 +42,7 @@ Signed-off-by: Dom Cobley HDMI_WRITE(HDMI_CEC_CNTRL_5, val | VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); } -@@ -1784,6 +1784,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1785,6 +1785,8 @@ static const struct vc4_hdmi_variant bcm .get_hsm_clock = vc4_hdmi_get_hsm_clock, .calc_hsm_clock = vc4_hdmi_calc_hsm_clock, .channel_map = vc4_hdmi_channel_map, @@ -51,7 +51,7 @@ Signed-off-by: Dom Cobley }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { -@@ -1809,6 +1811,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1810,6 +1812,8 @@ static const struct vc4_hdmi_variant bcm .get_hsm_clock = vc5_hdmi_get_hsm_clock, .calc_hsm_clock = vc5_hdmi_calc_hsm_clock, .channel_map = vc5_hdmi_channel_map, @@ -60,7 +60,7 @@ Signed-off-by: Dom Cobley }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { -@@ -1834,6 +1838,8 @@ static const struct vc4_hdmi_variant bcm +@@ -1835,6 +1839,8 @@ static const struct vc4_hdmi_variant bcm .get_hsm_clock = vc5_hdmi_get_hsm_clock, .calc_hsm_clock = vc5_hdmi_calc_hsm_clock, .channel_map = vc5_hdmi_channel_map, diff --git a/target/linux/bcm27xx/patches-5.4/950-0714-vc4_hdmi-Make-irq-shared.patch b/target/linux/bcm27xx/patches-5.4/950-0714-vc4_hdmi-Make-irq-shared.patch index dc0fec6c7a..423812324b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0714-vc4_hdmi-Make-irq-shared.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0714-vc4_hdmi-Make-irq-shared.patch @@ -10,7 +10,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1428,7 +1428,8 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1429,7 +1429,8 @@ static int vc4_hdmi_cec_init(struct vc4_ HDMI_WRITE(HDMI_CEC_CNTRL_1, value); ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, diff --git a/target/linux/bcm27xx/patches-5.4/950-0715-vc4_hdmi-Adjust-CEC-ref-clock-based-on-its-input-clo.patch b/target/linux/bcm27xx/patches-5.4/950-0715-vc4_hdmi-Adjust-CEC-ref-clock-based-on-its-input-clo.patch index da99772696..f6145e4ff5 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0715-vc4_hdmi-Adjust-CEC-ref-clock-based-on-its-input-clo.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0715-vc4_hdmi-Adjust-CEC-ref-clock-based-on-its-input-clo.patch @@ -32,7 +32,7 @@ Signed-off-by: Dom Cobley } static u32 vc5_hdmi_calc_hsm_clock(struct vc4_hdmi *vc4_hdmi, unsigned long pixel_rate) -@@ -1399,6 +1399,7 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1400,6 +1400,7 @@ static int vc4_hdmi_cec_init(struct vc4_ struct cec_connector_info conn_info; struct platform_device *pdev = vc4_hdmi->pdev; u32 value; @@ -40,7 +40,7 @@ Signed-off-by: Dom Cobley int ret; if (!vc4_hdmi->variant->cec_available) -@@ -1423,8 +1424,9 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1424,8 +1425,9 @@ static int vc4_hdmi_cec_init(struct vc4_ * divider: the hsm_clock rate and this divider setting will * give a 40 kHz CEC clock. */ @@ -51,7 +51,7 @@ Signed-off-by: Dom Cobley HDMI_WRITE(HDMI_CEC_CNTRL_1, value); ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0), vc4_cec_irq_handler, -@@ -1769,6 +1771,7 @@ static int vc4_hdmi_dev_remove(struct pl +@@ -1770,6 +1772,7 @@ static int vc4_hdmi_dev_remove(struct pl static const struct vc4_hdmi_variant bcm2835_variant = { .max_pixel_clock = 162000000, @@ -59,7 +59,7 @@ Signed-off-by: Dom Cobley .audio_available = true, .cec_available = true, .registers = vc4_hdmi_fields, -@@ -1793,6 +1796,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1794,6 +1797,7 @@ static const struct vc4_hdmi_variant bcm .id = 0, .audio_available = true, .max_pixel_clock = 297000000, @@ -67,7 +67,7 @@ Signed-off-by: Dom Cobley .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), .phy_lane_mapping = { -@@ -1820,6 +1824,7 @@ static const struct vc4_hdmi_variant bcm +@@ -1821,6 +1825,7 @@ static const struct vc4_hdmi_variant bcm .id = 1, .audio_available = true, .max_pixel_clock = 297000000, diff --git a/target/linux/bcm27xx/patches-5.4/950-0716-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch b/target/linux/bcm27xx/patches-5.4/950-0716-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch index 25d5fd9507..7713eed5b1 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0716-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0716-vc4_hdmi-Remove-cec_available-flag-as-always-support.patch @@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1402,9 +1402,6 @@ static int vc4_hdmi_cec_init(struct vc4_ +@@ -1403,9 +1403,6 @@ static int vc4_hdmi_cec_init(struct vc4_ u32 clk_cnt; int ret; @@ -22,7 +22,7 @@ Signed-off-by: Dom Cobley vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", CEC_CAP_DEFAULTS | -@@ -1773,7 +1770,6 @@ static const struct vc4_hdmi_variant bcm +@@ -1774,7 +1771,6 @@ static const struct vc4_hdmi_variant bcm .max_pixel_clock = 162000000, .cec_input_clock = VC4_HSM_CLOCK, .audio_available = true, diff --git a/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch b/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch index 339a8c5268..ff9d6b0005 100644 --- a/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch +++ b/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch @@ -49,7 +49,7 @@ Signed-off-by: RafaÅ‚ MiÅ‚ecki return UBI_IO_BAD_HDR_EBADMSG; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -820,6 +820,7 @@ extern struct mutex ubi_devices_mutex; +@@ -822,6 +822,7 @@ extern struct mutex ubi_devices_mutex; extern struct blocking_notifier_head ubi_notifiers; /* attach.c */ diff --git a/target/linux/generic/hack-5.4/251-sound_kconfig.patch b/target/linux/generic/hack-5.4/251-sound_kconfig.patch index bcc6e5476b..f593417c9d 100644 --- a/target/linux/generic/hack-5.4/251-sound_kconfig.patch +++ b/target/linux/generic/hack-5.4/251-sound_kconfig.patch @@ -156,7 +156,7 @@ Signed-off-by: John Crispin default n help This options enables a library of common routines used -@@ -212,16 +212,16 @@ config LIB80211 +@@ -212,17 +212,17 @@ config LIB80211 Drivers should select this themselves if needed. config LIB80211_CRYPT_WEP @@ -167,6 +167,7 @@ Signed-off-by: John Crispin config LIB80211_CRYPT_CCMP - tristate + tristate "LIB80211_CRYPT_CCMP" + select CRYPTO select CRYPTO_AES select CRYPTO_CCM diff --git a/target/linux/generic/hack-5.4/259-regmap_dynamic.patch b/target/linux/generic/hack-5.4/259-regmap_dynamic.patch index 185926468d..812e182467 100644 --- a/target/linux/generic/hack-5.4/259-regmap_dynamic.patch +++ b/target/linux/generic/hack-5.4/259-regmap_dynamic.patch @@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -3117,3 +3118,5 @@ static int __init regmap_initcall(void) +@@ -3118,3 +3119,5 @@ static int __init regmap_initcall(void) return 0; } postcore_initcall(regmap_initcall); diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index ed18da9e0c..407597c896 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2667,6 +2667,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2679,6 +2679,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2798,16 +2802,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2810,16 +2814,6 @@ static inline struct sk_buff *dev_alloc_ } diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch index a2a7e1eefe..19926866a6 100644 --- a/target/linux/generic/hack-5.4/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.4/902-debloat_proc.patch @@ -396,7 +396,7 @@ Signed-off-by: Felix Fietkau } --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -408,6 +408,9 @@ static struct pernet_operations ip_rt_pr +@@ -409,6 +409,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch index 7c768c6a7e..3216d20157 100644 --- a/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.4/904-debloat_dma_buf.patch @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau selftest.o \ --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -1298,4 +1298,5 @@ static void __exit dma_buf_deinit(void) +@@ -1300,4 +1300,5 @@ static void __exit dma_buf_deinit(void) dma_buf_uninit_debugfs(); kern_unmount(dma_buf_mnt); } diff --git a/target/linux/generic/pending-5.4/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch b/target/linux/generic/pending-5.4/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch index 2595e096bb..659a6386ae 100644 --- a/target/linux/generic/pending-5.4/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch +++ b/target/linux/generic/pending-5.4/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -910,7 +910,7 @@ static int get_chip(struct map_info *map +@@ -909,7 +909,7 @@ static int get_chip(struct map_info *map return 0; case FL_ERASING: diff --git a/target/linux/generic/pending-5.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/pending-5.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch index cf9fdabd71..8d2195e133 100644 --- a/target/linux/generic/pending-5.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch +++ b/target/linux/generic/pending-5.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch @@ -7,7 +7,7 @@ Signed-off-by: George Kashperko 1 file changed, 1 insertion(+) --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -2055,6 +2055,7 @@ static int __xipram do_write_buffer(stru +@@ -2054,6 +2054,7 @@ static int __xipram do_write_buffer(stru /* Write Buffer Load */ map_write(map, CMD(0x25), cmd_adr); diff --git a/target/linux/generic/pending-5.4/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-5.4/494-mtd-ubi-add-EOF-marker-support.patch index 57f5fcceba..fc48146221 100644 --- a/target/linux/generic/pending-5.4/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/pending-5.4/494-mtd-ubi-add-EOF-marker-support.patch @@ -50,7 +50,7 @@ Signed-off-by: Gabor Juhos break; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -776,6 +776,7 @@ struct ubi_attach_info { +@@ -780,6 +780,7 @@ struct ubi_attach_info { int mean_ec; uint64_t ec_sum; int ec_count; diff --git a/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 3260e645f3..605ce19f52 100644 --- a/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5741,6 +5741,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5742,6 +5742,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5871,10 +5878,19 @@ static int nf_tables_newflowtable(struct +@@ -5872,10 +5879,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -6000,7 +6016,8 @@ static int nf_tables_fill_flowtable_info +@@ -6001,7 +6017,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch index d8ca330ac2..f7ab7e492f 100644 --- a/target/linux/generic/pending-5.4/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.4/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2633,7 +2633,7 @@ static inline int pskb_network_may_pull( +@@ -2645,7 +2645,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch index e9fe405142..b289a6526a 100644 --- a/target/linux/generic/pending-5.4/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.4/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -5114,6 +5127,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5117,6 +5130,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -6048,6 +6064,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -6053,6 +6069,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -6083,6 +6102,12 @@ static void ata_host_release(struct kref +@@ -6088,6 +6107,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -6546,7 +6571,23 @@ int ata_host_register(struct ata_host *h +@@ -6551,7 +6576,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } @@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -880,6 +883,12 @@ struct ata_port { +@@ -881,6 +884,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch index f1c80460e9..7523b396ba 100644 --- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz help --- a/init/main.c +++ b/init/main.c -@@ -366,6 +366,29 @@ static inline void setup_nr_cpu_ids(void +@@ -367,6 +367,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -596,6 +619,7 @@ asmlinkage __visible void __init start_k +@@ -597,6 +620,7 @@ asmlinkage __visible void __init start_k pr_notice("%s", linux_banner); early_security_init(); setup_arch(&command_line); diff --git a/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index 7258c6048d..5eb1560774 100644 --- a/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-5.4/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -39,7 +39,7 @@ Signed-off-by: Sylwester Nawrocki --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -2105,6 +2105,75 @@ put_table: +@@ -2095,6 +2095,75 @@ put_table: } /** diff --git a/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index f3ca3c0fb5..d4dd53d2dc 100644 --- a/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-5.4/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/opp/core.c +++ b/drivers/opp/core.c -@@ -2145,6 +2145,7 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -2135,6 +2135,7 @@ int dev_pm_opp_adjust_voltage(struct dev struct opp_table *opp_table; struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; @@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov /* Find the opp_table */ opp_table = _find_opp_table(dev); -@@ -2174,8 +2175,17 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -2164,8 +2165,17 @@ int dev_pm_opp_adjust_voltage(struct dev goto adjust_unlock; opp->supplies->u_volt = u_volt; diff --git a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 99a64ccadc..0ca2c5f806 100644 --- a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -178,7 +178,7 @@ Signed-off-by: Adrian Panella } --- a/init/main.c +++ b/init/main.c -@@ -103,6 +103,10 @@ +@@ -104,6 +104,10 @@ #define CREATE_TRACE_POINTS #include @@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -632,6 +636,18 @@ asmlinkage __visible void __init start_k +@@ -633,6 +637,18 @@ asmlinkage __visible void __init start_k pr_notice("Kernel command line: %s\n", boot_command_line); /* parameters may set static keys */ jump_label_init(); diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse.dtsi index f2845ee4ac..c477473a06 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + #include / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts index 8bb3e3cbd8..d91a37ff12 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "amazonse.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts index ca530e39d3..878f8ccda2 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "amazonse.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9.dtsi index d4afd23f7b..362ecaa90c 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + #include / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts index 0f635127f8..6cb693b2e2 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts index 424b778bb4..74c8add71c 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts index 9c1ebf42f0..40d1e597c5 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts index 98ce11c250..c55d2fdd1e 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts index cbc99fe620..b4fc4e4bde 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9_netgear_dgn3500.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts index b69613e48f..e071f02bc0 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500b.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9_netgear_dgn3500.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts index 95df8ed048..f19ce3ef8b 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts index 81ce539930..888c053763 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "ar9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube.dtsi index eae613e008..ced3e3bcb4 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + #include / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts index 89a7adcd6c..a6a8b93a24 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts index ff34068005..50ae5c791e 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube_arcadyan_arv4518pwr01.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts index b261a2fa91..866866c3eb 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01a.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube_arcadyan_arv4518pwr01.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts index 42eb12c80b..c990978e40 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts index 02ec8705af..cde1d5df2a 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts index ac0af44a90..0d3c606b37 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts index 096180ac9d..78d7a28b5b 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts index 854648ddc3..13ddfa730b 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts index b48559d3cd..120dca1834 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts index e0e47681bf..867205b65e 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts index 79019b635b..839af43773 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts index fd92ed49c9..c9fd15f901 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts index a3cb132019..56d3854d15 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts index 60fd8bb918..f1df2b6096 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts index 4bf44a10e1..b24ae6987a 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts index f40d278411..624f815148 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_audiocodes_mp-252.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts index 9f2d8ec336..fb35af527e 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts index cba2d7eb84..92091507c0 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_lantiq_easy50712.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts index 4a023d1e3f..b2585cf5a7 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "danube.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon.dtsi index cf9b33ea93..2f5557c0c7 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts index 22ce8caced..c4f74dad94 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts @@ -1,9 +1,8 @@ -/dts-v1/; - -#include #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon FTTDP8 Reference Board"; compatible = "lantiq,easy88388", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts index fa331450bf..13530177cf 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts @@ -1,9 +1,8 @@ -/dts-v1/; - -#include #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon FTTdp G.FAST Reference Board"; compatible = "lantiq,easy88444", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index 06f5110bce..adb3394dbd 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts index 5e4084f24e..3c8f6a99f7 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts index 8c931746ed..c55559177b 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon_lantiq_easy98000.dtsi" #include "falcon_sflash-16m.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi index 5821c51def..9fc7630f22 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi @@ -1,8 +1,8 @@ +#include "falcon.dtsi" + #include #include -#include "falcon.dtsi" - / { compatible = "lantiq,easy98000", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts index 773a490019..0b5181e374 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts @@ -1,10 +1,8 @@ -/dts-v1/; - -#include - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon Reference Board V1.8"; compatible = "lantiq,easy98020-v18", "lantiq,easy98020", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts index 397764aac4..29456da3c5 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts @@ -1,10 +1,8 @@ -/dts-v1/; - -#include - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon Reference Board"; compatible = "lantiq,easy98020", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts index aa63268149..57484ca6d4 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts @@ -1,10 +1,8 @@ -/dts-v1/; - -#include - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon HGU Reference Board"; compatible = "lantiq,easy98021", "lantiq,easy98020", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts index f1ecebec3b..1efc06c037 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts index 98421174d3..a320acd2e6 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98035synce1588.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts index 130d49ebd7..09ac4f5490 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts @@ -1,10 +1,8 @@ -/dts-v1/; - -#include - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" +#include + / { model = "Lantiq Falcon / Vinax MDU Board"; compatible = "lantiq,falcon-mdu", "lantiq,falcon"; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts index 880c4edca8..c08fd746bf 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-sfp.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "falcon.dtsi" #include "falcon_sflash-16m.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9.dtsi index 19f42d8c84..60f7f7a4c0 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9.dtsi +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9.dtsi @@ -1,3 +1,5 @@ +/dts-v1/; + #include #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts index b9be5d55d2..52b9287528 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts index d9cdf22349..15e965e5af 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts index ba1a01e36f..8aba447b2b 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts index 9f6f405a09..df0c8ea5da 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-brn.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_arcadyan_vgv7510kw22.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts index bbe3b0ed47..732ffd48a2 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22-nor.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_arcadyan_vgv7510kw22.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts index 051de0c23e..3e2e771840 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-brn.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_arcadyan_vgv7519.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts index e9606e19a2..de5ea97d23 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519-nor.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_arcadyan_vgv7519.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts index 1aea98260a..e1d0851dab 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-hynix.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_avm_fritz3370-rev2.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts index a19d168159..2a98a12acb 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2-micron.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_avm_fritz3370-rev2.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts index a2e4bc9292..309f402df2 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; #include "vr9_avm_fritz736x.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts index e4c74d443f..758a5b9814 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; #include "vr9_avm_fritz736x.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts index 0cfdb802e2..959cb80ef4 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; #include "vr9_avm_fritz736x.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts index 85fb3368c6..2518cb8b12 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; #include "vr9.dtsi" diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts index a506b7dd13..db4d02d167 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts index 410992d518..971d7fd9f5 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts index 7a7ab1cd43..475d5a59d7 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nand.dts @@ -1,6 +1,3 @@ -/dts-v1/; - - #include "vr9_lantiq_easy80920.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts index 004ce6f000..b0977b35c5 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920-nor.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_lantiq_easy80920.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts index d6dd5edfe4..bd72fab630 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9.dtsi" #include diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts index 9b3055983a..1ac6440744 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8970.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_tplink_tdw89x0.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts index 725aa759d2..faa9b979bd 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_tplink_tdw89x0.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts index 512db47e7d..15a342955a 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_tplink_vr200.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts index d042714a5b..10c95fa873 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_tplink_vr200.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts index fc19468f77..03a00c6930 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_zyxel_p-2812hnu-fx.dtsi" / { diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts index 46a8137857..12280241a5 100644 --- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f3.dts @@ -1,5 +1,3 @@ -/dts-v1/; - #include "vr9_zyxel_p-2812hnu-fx.dtsi" / { diff --git a/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch index cb482bc522..8fa0e9d5d8 100644 --- a/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch @@ -5480,7 +5480,7 @@ Signed-off-by: John Crispin (transaction layer end-to-end CRC checking). --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1390,6 +1390,8 @@ void pci_walk_bus(struct pci_bus *top, i +@@ -1389,6 +1389,8 @@ void pci_walk_bus(struct pci_bus *top, i void *userdata); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); diff --git a/target/linux/lantiq/patches-5.4/0004-MIPS-lantiq-add-atm-hack.patch b/target/linux/lantiq/patches-5.4/0004-MIPS-lantiq-add-atm-hack.patch index 1b1a0a1ca7..2cbcf06a01 100644 --- a/target/linux/lantiq/patches-5.4/0004-MIPS-lantiq-add-atm-hack.patch +++ b/target/linux/lantiq/patches-5.4/0004-MIPS-lantiq-add-atm-hack.patch @@ -471,7 +471,7 @@ Signed-off-by: John Crispin int max_pcr; /* maximum PCR in cells per second */ --- a/net/atm/proc.c +++ b/net/atm/proc.c -@@ -142,7 +142,7 @@ static void *vcc_seq_next(struct seq_fil +@@ -141,7 +141,7 @@ static void *vcc_seq_next(struct seq_fil static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) { static const char *const class_name[] = { diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index 1bf956584c..6ed3e7c155 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -102,7 +102,10 @@ define Device/fsl_ls1043a-rdb DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1043a-rdb \ - fmc fmc-eth-config + fmc fmc-eth-config \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk IMAGE/firmware.bin := \ ls-clean | \ @@ -123,7 +126,10 @@ define Device/fsl_ls1043a-rdb-sdboot DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1043a-rdb-sdboot \ - fmc fmc-eth-config + fmc fmc-eth-config \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk FILESYSTEMS := ext4 IMAGES := sdcard.img sysupgrade.bin @@ -152,7 +158,10 @@ define Device/fsl_ls1046a-rdb DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1046a-rdb \ - fmc fmc-eth-config + fmc fmc-eth-config \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk IMAGE/firmware.bin := \ ls-clean | \ @@ -173,7 +182,10 @@ define Device/fsl_ls1046a-rdb-sdboot DEVICE_PACKAGES += \ layerscape-fman \ tfa-ls1046a-rdb-sdboot \ - fmc fmc-eth-config + fmc fmc-eth-config \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk FILESYSTEMS := ext4 IMAGES := sdcard.img sysupgrade.bin @@ -203,7 +215,10 @@ define Device/fsl_ls1088a-rdb layerscape-mc \ layerscape-dpl \ tfa-ls1088a-rdb \ - restool + restool \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -226,7 +241,10 @@ define Device/fsl_ls1088a-rdb-sdboot layerscape-mc \ layerscape-dpl \ tfa-ls1088a-rdb-sdboot \ - restool + restool \ + kmod-ahci-qoriq \ + kmod-hwmon-ina2xx \ + kmod-hwmon-lm90 DEVICE_DTS := freescale/fsl-ls1088a-rdb FILESYSTEMS := ext4 IMAGES := sdcard.img sysupgrade.bin @@ -257,7 +275,8 @@ define Device/fsl_ls2088a-rdb layerscape-mc \ layerscape-dpl \ tfa-ls2088a-rdb \ - restool + restool \ + kmod-ahci-qoriq IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ diff --git a/target/linux/layerscape/modules.mk b/target/linux/layerscape/modules.mk index 5f2d472c95..4d713b597e 100644 --- a/target/linux/layerscape/modules.mk +++ b/target/linux/layerscape/modules.mk @@ -5,6 +5,22 @@ # See /LICENSE for more information. # +define KernelPackage/ahci-qoriq + SUBMENU:=$(BLOCK_MENU) + TITLE:=Freescale QorIQ AHCI SATA support + KCONFIG:=CONFIG_AHCI_QORIQ + FILES:=$(LINUX_DIR)/drivers/ata/ahci_qoriq.ko + AUTOLOAD:=$(call AutoLoad,40,ahci-qoriq,1) + $(call AddDepends/ata,+kmod-ata-ahci-platform @TARGET_layerscape) +endef + +define KernelPackage/ahci-qoriq/description + This option enables support for the Freescale QorIQ AHCI SoC's + onboard AHCI SATA. +endef + +$(eval $(call KernelPackage,ahci-qoriq)) + define KernelPackage/ppfe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Freescale PPFE Driver support diff --git a/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch b/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch index 59a36bf67f..0ec6133fca 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0192-dpaa2-eth-Add-support-for-Rx-traffic-classes.patch @@ -101,7 +101,7 @@ Signed-off-by: Ioana Radulescu } /* For each FQ, decide on which core to process incoming frames */ -@@ -2699,7 +2704,7 @@ static int setup_rx_flow(struct dpaa2_et +@@ -2701,7 +2706,7 @@ static int setup_rx_flow(struct dpaa2_et int err; err = dpni_get_queue(priv->mc_io, 0, priv->mc_token, @@ -110,7 +110,7 @@ Signed-off-by: Ioana Radulescu if (err) { dev_err(dev, "dpni_get_queue(RX) failed\n"); return err; -@@ -2712,7 +2717,7 @@ static int setup_rx_flow(struct dpaa2_et +@@ -2714,7 +2719,7 @@ static int setup_rx_flow(struct dpaa2_et queue.destination.priority = 1; queue.user_context = (u64)(uintptr_t)fq; err = dpni_set_queue(priv->mc_io, 0, priv->mc_token, @@ -119,7 +119,7 @@ Signed-off-by: Ioana Radulescu DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST, &queue); if (err) { -@@ -2721,6 +2726,10 @@ static int setup_rx_flow(struct dpaa2_et +@@ -2723,6 +2728,10 @@ static int setup_rx_flow(struct dpaa2_et } /* xdp_rxq setup */ @@ -130,7 +130,7 @@ Signed-off-by: Ioana Radulescu err = xdp_rxq_info_reg(&fq->channel->xdp_rxq, priv->net_dev, fq->flowid); if (err) { -@@ -2858,7 +2867,7 @@ static int config_legacy_hash_key(struct +@@ -2860,7 +2869,7 @@ static int config_legacy_hash_key(struct { struct device *dev = priv->net_dev->dev.parent; struct dpni_rx_tc_dist_cfg dist_cfg; @@ -139,7 +139,7 @@ Signed-off-by: Ioana Radulescu memset(&dist_cfg, 0, sizeof(dist_cfg)); -@@ -2866,9 +2875,14 @@ static int config_legacy_hash_key(struct +@@ -2868,9 +2877,14 @@ static int config_legacy_hash_key(struct dist_cfg.dist_size = dpaa2_eth_queue_count(priv); dist_cfg.dist_mode = DPNI_DIST_MODE_HASH; @@ -157,7 +157,7 @@ Signed-off-by: Ioana Radulescu return err; } -@@ -2878,7 +2892,7 @@ static int config_hash_key(struct dpaa2_ +@@ -2880,7 +2894,7 @@ static int config_hash_key(struct dpaa2_ { struct device *dev = priv->net_dev->dev.parent; struct dpni_rx_dist_cfg dist_cfg; @@ -166,7 +166,7 @@ Signed-off-by: Ioana Radulescu memset(&dist_cfg, 0, sizeof(dist_cfg)); -@@ -2886,9 +2900,15 @@ static int config_hash_key(struct dpaa2_ +@@ -2888,9 +2902,15 @@ static int config_hash_key(struct dpaa2_ dist_cfg.dist_size = dpaa2_eth_queue_count(priv); dist_cfg.enable = 1; @@ -185,7 +185,7 @@ Signed-off-by: Ioana Radulescu return err; } -@@ -2898,7 +2918,7 @@ static int config_cls_key(struct dpaa2_e +@@ -2900,7 +2920,7 @@ static int config_cls_key(struct dpaa2_e { struct device *dev = priv->net_dev->dev.parent; struct dpni_rx_dist_cfg dist_cfg; @@ -194,7 +194,7 @@ Signed-off-by: Ioana Radulescu memset(&dist_cfg, 0, sizeof(dist_cfg)); -@@ -2906,9 +2926,15 @@ static int config_cls_key(struct dpaa2_e +@@ -2908,9 +2928,15 @@ static int config_cls_key(struct dpaa2_e dist_cfg.dist_size = dpaa2_eth_queue_count(priv); dist_cfg.enable = 1; diff --git a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch index 4c9ae512a0..80e6afed34 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0194-dpaa2-eth-Distribute-ingress-frames-based-on-VLAN-pr.patch @@ -147,7 +147,7 @@ Signed-off-by: Ioana Radulescu + priv->cls_rules = devm_kzalloc(dev, sizeof(struct dpaa2_eth_cls_rule) * dpaa2_eth_fs_count(priv), GFP_KERNEL); - if (!priv->cls_rules) + if (!priv->cls_rules) { --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -414,6 +414,7 @@ struct dpaa2_eth_priv { diff --git a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch index 2d38b6b0d6..965212ed54 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0199-dpaa2-eth-Add-DCB-ops.patch @@ -33,7 +33,7 @@ Signed-off-by: Ioana Radulescu depends on FSL_DPAA2_ETH && PTP_1588_CLOCK_QORIQ --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3612,6 +3612,81 @@ static void del_ch_napi(struct dpaa2_eth +@@ -3614,6 +3614,81 @@ static void del_ch_napi(struct dpaa2_eth } } @@ -115,7 +115,7 @@ Signed-off-by: Ioana Radulescu static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) { struct device *dev; -@@ -3701,6 +3776,15 @@ static int dpaa2_eth_probe(struct fsl_mc +@@ -3703,6 +3778,15 @@ static int dpaa2_eth_probe(struct fsl_mc if (err) goto err_alloc_rings; diff --git a/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch b/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch index 65d81f337d..4396f2ea8e 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0200-dpaa2-eth-Enable-Rx-PFC.patch @@ -26,7 +26,7 @@ Signed-off-by: Ioana Radulescu --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3618,6 +3618,9 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s +@@ -3620,6 +3620,9 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s { struct dpaa2_eth_priv *priv = netdev_priv(net_dev); @@ -36,7 +36,7 @@ Signed-off-by: Ioana Radulescu memcpy(pfc, &priv->pfc, sizeof(priv->pfc)); pfc->pfc_cap = dpaa2_eth_tc_count(priv); -@@ -3628,6 +3631,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3630,6 +3633,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s struct ieee_pfc *pfc) { struct dpaa2_eth_priv *priv = netdev_priv(net_dev); @@ -45,7 +45,7 @@ Signed-off-by: Ioana Radulescu if (pfc->mbc || pfc->delay) return -EOPNOTSUPP; -@@ -3636,6 +3641,24 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3638,6 +3643,24 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s if (priv->pfc.pfc_en == pfc->pfc_en) return 0; diff --git a/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch b/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch index c663578ffc..7d18504070 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0201-dpaa2-eth-Enable-Tx-PFC.patch @@ -19,7 +19,7 @@ Signed-off-by: Ioana Radulescu --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3627,6 +3627,47 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s +@@ -3629,6 +3629,47 @@ static int dpaa2_eth_dcbnl_ieee_getpfc(s return 0; } @@ -67,7 +67,7 @@ Signed-off-by: Ioana Radulescu static int dpaa2_eth_dcbnl_ieee_setpfc(struct net_device *net_dev, struct ieee_pfc *pfc) { -@@ -3644,7 +3685,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3646,7 +3687,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s /* We allow PFC configuration even if it won't have any effect until * general pause frames are enabled */ @@ -77,7 +77,7 @@ Signed-off-by: Ioana Radulescu netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n"); link_cfg.rate = priv->link_state.rate; -@@ -3659,6 +3701,11 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3661,6 +3703,11 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s return err; } diff --git a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch index 8ac8ccf9bc..9a0024636d 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0202-dpaa2-eth-Keep-congestion-group-taildrop-enabled-whe.patch @@ -87,7 +87,7 @@ Signed-off-by: Ioana Radulescu /* Chech link state; speed / duplex changes are not treated yet */ if (priv->link_state.up == state.up) -@@ -3673,6 +3688,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3675,6 +3690,7 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s { struct dpaa2_eth_priv *priv = netdev_priv(net_dev); struct dpni_link_cfg link_cfg = {0}; @@ -95,7 +95,7 @@ Signed-off-by: Ioana Radulescu int err; if (pfc->mbc || pfc->delay) -@@ -3685,8 +3701,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3687,8 +3703,8 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s /* We allow PFC configuration even if it won't have any effect until * general pause frames are enabled */ @@ -106,7 +106,7 @@ Signed-off-by: Ioana Radulescu netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n"); link_cfg.rate = priv->link_state.rate; -@@ -3707,6 +3723,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s +@@ -3709,6 +3725,9 @@ static int dpaa2_eth_dcbnl_ieee_setpfc(s return err; memcpy(&priv->pfc, pfc, sizeof(priv->pfc)); diff --git a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch index 73dead7363..4974362d71 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0204-dpaa2-eth-Add-Tx-shaping-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Bogdan Purcareata --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3776,6 +3776,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc +@@ -3778,6 +3778,83 @@ const struct dcbnl_rtnl_ops dpaa2_eth_dc }; #endif @@ -103,7 +103,7 @@ Signed-off-by: Bogdan Purcareata static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) { struct device *dev; -@@ -3895,6 +3972,7 @@ static int dpaa2_eth_probe(struct fsl_mc +@@ -3897,6 +3974,7 @@ static int dpaa2_eth_probe(struct fsl_mc #ifdef CONFIG_DEBUG_FS dpaa2_dbg_add(priv); #endif @@ -111,7 +111,7 @@ Signed-off-by: Bogdan Purcareata dev_info(dev, "Probed interface %s\n", net_dev->name); return 0; -@@ -3942,6 +4020,8 @@ static int dpaa2_eth_remove(struct fsl_m +@@ -3944,6 +4022,8 @@ static int dpaa2_eth_remove(struct fsl_m #ifdef CONFIG_DEBUG_FS dpaa2_dbg_remove(priv); #endif diff --git a/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch b/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch index 58e744354a..5d5d8f5fd5 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0205-dpaa2-eth-Add-Rx-error-queue.patch @@ -113,7 +113,7 @@ Signed-off-by: Ioana Radulescu /* For each FQ, decide on which core to process incoming frames */ set_fq_affinity(priv); } -@@ -2944,6 +2998,40 @@ static int setup_tx_flow(struct dpaa2_et +@@ -2946,6 +3000,40 @@ static int setup_tx_flow(struct dpaa2_et return 0; } @@ -154,7 +154,7 @@ Signed-off-by: Ioana Radulescu /* Supported header fields for Rx hash distribution key */ static const struct dpaa2_eth_dist_fields dist_fields[] = { { -@@ -3313,7 +3401,11 @@ static int bind_dpni(struct dpaa2_eth_pr +@@ -3315,7 +3403,11 @@ static int bind_dpni(struct dpaa2_eth_pr /* Configure handling of error frames */ err_cfg.errors = DPAA2_FAS_RX_ERR_MASK; err_cfg.set_frame_annotation = 1; @@ -166,7 +166,7 @@ Signed-off-by: Ioana Radulescu err = dpni_set_errors_behavior(priv->mc_io, 0, priv->mc_token, &err_cfg); if (err) { -@@ -3330,6 +3422,11 @@ static int bind_dpni(struct dpaa2_eth_pr +@@ -3332,6 +3424,11 @@ static int bind_dpni(struct dpaa2_eth_pr case DPAA2_TX_CONF_FQ: err = setup_tx_flow(priv, &priv->fq[i]); break; diff --git a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch index dfbb892c82..bb80578cdd 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0209-dpaa2-eth-Update-dpni_set_tx_shaping-cmd-to-v2.patch @@ -15,7 +15,7 @@ Signed-off-by: Bogdan Purcareata --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c -@@ -3893,7 +3893,7 @@ static ssize_t dpaa2_eth_write_tx_shapin +@@ -3895,7 +3895,7 @@ static ssize_t dpaa2_eth_write_tx_shapin { int err, items; struct dpaa2_eth_priv *priv = netdev_priv(to_net_dev(dev)); @@ -24,7 +24,7 @@ Signed-off-by: Bogdan Purcareata items = sscanf(buf, "%u %hu", &scfg.rate_limit, &scfg.max_burst_size); if (items != 2) { -@@ -3907,7 +3907,8 @@ static ssize_t dpaa2_eth_write_tx_shapin +@@ -3909,7 +3909,8 @@ static ssize_t dpaa2_eth_write_tx_shapin return -EINVAL; } diff --git a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch index cc8cfb1c29..ca06007dfe 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch @@ -1561,7 +1561,7 @@ Signed-off-by: Camelia Groza static const struct net_device_ops dpaa2_eth_ops = { .ndo_open = dpaa2_eth_open, .ndo_start_xmit = dpaa2_eth_tx, -@@ -4171,18 +4191,27 @@ static int __init dpaa2_eth_driver_init( +@@ -4173,18 +4193,27 @@ static int __init dpaa2_eth_driver_init( dpaa2_eth_dbg_init(); err = fsl_mc_driver_register(&dpaa2_eth_driver); diff --git a/target/linux/layerscape/patches-5.4/811-kvm-0004-virt-vgic-Increase-number-of-DeviceIDs-to-17.patch b/target/linux/layerscape/patches-5.4/811-kvm-0004-virt-vgic-Increase-number-of-DeviceIDs-to-17.patch index 11492b0ce9..0c55bf9942 100644 --- a/target/linux/layerscape/patches-5.4/811-kvm-0004-virt-vgic-Increase-number-of-DeviceIDs-to-17.patch +++ b/target/linux/layerscape/patches-5.4/811-kvm-0004-virt-vgic-Increase-number-of-DeviceIDs-to-17.patch @@ -15,7 +15,7 @@ Signed-off-by: Bharat Bhushan --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c -@@ -241,7 +241,7 @@ static struct its_ite *find_ite(struct v +@@ -248,7 +248,7 @@ static struct its_ite *find_ite(struct v #define GIC_LPI_OFFSET 8192 #define VITS_TYPER_IDBITS 16 diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch b/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch index 1175efa432..d01ee99a55 100644 --- a/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch +++ b/target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch @@ -229,7 +229,7 @@ Signed-off-by: Hou Zhiqiang * fall back to INTx or other interrupts, e.g., a system shared --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -2021,6 +2021,7 @@ static inline void pcibios_penalize_isa_ +@@ -2020,6 +2020,7 @@ static inline void pcibios_penalize_isa_ int pcibios_alloc_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev); resource_size_t pcibios_default_alignment(void); diff --git a/target/linux/layerscape/patches-5.4/820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch b/target/linux/layerscape/patches-5.4/820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch deleted file mode 100644 index 98bf576690..0000000000 --- a/target/linux/layerscape/patches-5.4/820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 355f342af78a54051f38ffa4b4018e6ea6b9e3d4 Mon Sep 17 00:00:00 2001 -From: Li Jun -Date: Mon, 28 Jan 2019 11:19:03 +0800 -Subject: [PATCH] usb: dwc3: gadget: increase timeout value for send ep cmd - -In case the USB3 PHY enters P3, then ep command may need a long -time to complete, per test of ep0out enable, the dwc3 trace time -stamp shows the time is more then 280us, so increase the timeout -loop count to be 2000, this has no side effect for HW which has -no this problem. - -Signed-off-by: Li Jun ---- - drivers/usb/dwc3/gadget.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/dwc3/gadget.c -+++ b/drivers/usb/dwc3/gadget.c -@@ -270,7 +270,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ - { - const struct usb_endpoint_descriptor *desc = dep->endpoint.desc; - struct dwc3 *dwc = dep->dwc; -- u32 timeout = 1000; -+ u32 timeout = 2000; - u32 saved_config = 0; - u32 reg; - diff --git a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch index 0eac2ed66e..b480490b8d 100644 --- a/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch +++ b/target/linux/mediatek/patches-5.4/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch @@ -141,7 +141,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c -@@ -1488,9 +1488,10 @@ static void axienet_mac_link_down(struct +@@ -1499,9 +1499,10 @@ static void axienet_mac_link_down(struct } static void axienet_mac_link_up(struct phylink_config *config, diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch index 104334dc03..92383f51b4 100644 --- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2564,6 +2564,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2578,6 +2578,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch index 5969a10a86..ed92476302 100644 --- a/target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -176,7 +176,7 @@ Signed-off-by: Michael Gray } --- a/init/main.c +++ b/init/main.c -@@ -103,6 +103,10 @@ +@@ -104,6 +104,10 @@ #define CREATE_TRACE_POINTS #include @@ -187,7 +187,7 @@ Signed-off-by: Michael Gray static int kernel_init(void *); extern void init_IRQ(void); -@@ -630,6 +634,18 @@ asmlinkage __visible void __init start_k +@@ -631,6 +635,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 042461e73b..699d131c9f 100644 --- a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella } --- a/init/main.c +++ b/init/main.c -@@ -103,6 +103,10 @@ +@@ -104,6 +104,10 @@ #define CREATE_TRACE_POINTS #include @@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -630,6 +634,18 @@ asmlinkage __visible void __init start_k +@@ -631,6 +635,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch index 28d6f8b570..5d93ce39f7 100644 --- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); -@@ -5121,6 +5129,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5124,6 +5132,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -5166,6 +5177,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5169,6 +5180,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); @@ -36,8 +36,8 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -909,6 +909,8 @@ struct ata_port_operations { - void (*qc_prep)(struct ata_queued_cmd *qc); +@@ -910,6 +910,8 @@ struct ata_port_operations { + enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc); unsigned int (*qc_issue)(struct ata_queued_cmd *qc); bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); + int (*qc_new)(struct ata_port *ap); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -999,6 +1001,9 @@ struct ata_port_operations { +@@ -1000,6 +1002,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); diff --git a/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..161b79dac4 --- /dev/null +++ b/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,8 @@ +. /lib/functions.sh +. /lib/functions/migrations.sh + +remove_devicename_leds "rt2800soc-phy0" "rt2800pci-phy0" + +migrations_apply system + +exit 0 diff --git a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts index 66776c2fc6..ba251c2656 100644 --- a/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts +++ b/target/linux/ramips/dts/mt7620a_aigale_ai-br100.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; wan { - label = "ai-br100:blue:wan"; + label = "blue:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; led_wlan: wlan { - label = "ai-br100:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts index 8632f5ce04..fe666e482a 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_ac1200rm.dts @@ -62,12 +62,12 @@ compatible = "gpio-leds"; wlan2g { - label = "ac1200rm:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "ac1200rm:green:wps"; + label = "green:wps"; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts index 366a377440..58386a9ac7 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_r36m-e4g.dts @@ -81,40 +81,40 @@ compatible = "gpio-leds"; 4g { - label = "r36m-e4g:orange:4g"; + label = "orange:4g"; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; lan { - label = "r36m-e4g:green:lan"; + label = "green:lan"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; led_system: system { - label = "r36m-e4g:green:system"; + label = "green:system"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; default-state = "keep"; }; sim1 { - label = "r36m-e4g:green:sim1"; + label = "green:sim1"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; default-state = "keep"; }; sim2 { - label = "r36m-e4g:green:sim2"; + label = "green:sim2"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; default-state = "keep"; }; wan { - label = "r36m-e4g:green:wan"; + label = "green:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; wlan { - label = "r36m-e4g:orange:wlan"; + label = "orange:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; diff --git a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts index 2462e13b47..42047390b0 100644 --- a/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts +++ b/target/linux/ramips/dts/mt7620a_alfa-network_tube-e4g.dts @@ -69,29 +69,29 @@ compatible = "gpio-leds"; 4g { - label = "tube-e4g:green:4g"; + label = "green:4g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; lan { - label = "tube-e4g:blue:lan"; + label = "blue:lan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; power: power { - label = "tube-e4g:green:power"; + label = "green:power"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; default-state = "keep"; }; sim1 { - label = "tube-e4g:green:sim1"; + label = "green:sim1"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; default-state = "keep"; }; sim2 { - label = "tube-e4g:green:sim2"; + label = "green:sim2"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; default-state = "keep"; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts index d58591e950..3cb9142c38 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rp-n53.dts @@ -39,42 +39,42 @@ compatible = "gpio-leds"; backlight { - label = "rp-n53:white:back"; + label = "white:back"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; wifi0 { - label = "rp-n53:blue:5g3"; + label = "blue:5g3"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; wifi1 { - label = "rp-n53:blue:5g2"; + label = "blue:5g2"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "rp-n53:blue:5g1"; + label = "blue:5g1"; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; wifi3 { - label = "rp-n53:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; }; wifi4 { - label = "rp-n53:blue:2g1"; + label = "blue:2g1"; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; wifi5 { - label = "rp-n53:blue:2g2"; + label = "blue:2g2"; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; wifi6 { - label = "rp-n53:blue:2g3"; + label = "blue:2g3"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts index f517e2c0e2..0710b25571 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac51u.dts @@ -3,42 +3,6 @@ / { compatible = "asus,rt-ac51u", "ralink,mt7620a-soc"; model = "Asus RT-AC51U"; - - 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 = "rt-ac51u:blue:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - }; - - usb { - label = "rt-ac51u:blue:usb"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; - trigger-sources = <&ohci_port1>, <&ehci_port1>; - linux,default-trigger = "usbport"; - }; - - wifi2g { - label = "rt-ac51u:blue:wifi2g"; - gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "wled", "uartf"; - function = "gpio"; - }; }; &pcie0 { diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts b/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts index d0ff5d6d70..acc60807b6 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts +++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac54u.dts @@ -5,42 +5,6 @@ / { compatible = "asus,rt-ac54u", "ralink,mt7620a-soc"; model = "Asus RT-AC54U"; - - 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 = "rt-ac54u:blue:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - }; - - usb { - label = "rt-ac54u:blue:usb"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; - trigger-sources = <&ohci_port1>, <&ehci_port1>; - linux,default-trigger = "usbport"; - }; - - wifi2g { - label = "rt-ac54u:blue:wifi2g"; - gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "wled", "uartf"; - function = "gpio"; - }; }; &pcie0 { diff --git a/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi b/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi index adec8a1a6f..423b4edc6b 100644 --- a/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi +++ b/target/linux/ramips/dts/mt7620a_asus_rt-ac5x.dtsi @@ -6,6 +6,10 @@ / { aliases { label-mac-device = ðernet; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -23,6 +27,28 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "blue:power"; + gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + }; + + usb { + label = "blue:usb"; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>; + linux,default-trigger = "usbport"; + }; + + wifi2g { + label = "blue:wifi2g"; + gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + }; }; &spi0 { @@ -88,6 +114,13 @@ status = "okay"; }; +&state_default { + gpio { + groups = "i2c", "wled", "uartf"; + function = "gpio"; + }; +}; + ðernet { mtd-mac-address = <&factory 0x28>; diff --git a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts index f7d2748d2e..07586f6922 100644 --- a/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts +++ b/target/linux/ramips/dts/mt7620a_bdcom_wap2100-sk.dts @@ -22,19 +22,19 @@ compatible = "gpio-leds"; usb { - label = "wap2100-sk:green:usb"; + label = "green:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: wps { - label = "wap2100-sk:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "wap2100-sk:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts index bba0bde86d..196bbde726 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-1166d.dts @@ -18,37 +18,37 @@ compatible = "gpio-leds"; power { - label = "whr-1166d:red:power"; + label = "red:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wifi { - label = "whr-1166d:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_power_green: power2 { - label = "whr-1166d:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "whr-1166d:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; internet { - label = "whr-1166d:green:internet"; + label = "green:internet"; gpios = <&gpio2 17 GPIO_ACTIVE_LOW>; }; router { - label = "whr-1166d:orange:router"; + label = "orange:router"; gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; }; router2 { - label = "whr-1166d:green:router"; + label = "green:router"; gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts index cd370b989b..ed2e03d6cf 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-300hp2.dts @@ -18,37 +18,37 @@ compatible = "gpio-leds"; power { - label = "whr-300hp2:red:power"; + label = "red:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wifi { - label = "whr-300hp2:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_power_green: power2 { - label = "whr-300hp2:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "whr-300hp2:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; internet { - label = "whr-300hp2:green:internet"; + label = "green:internet"; gpios = <&gpio2 17 GPIO_ACTIVE_LOW>; }; router { - label = "whr-300hp2:green:router"; + label = "green:router"; gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; }; router2 { - label = "whr-300hp2:orange:router"; + label = "orange:router"; gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts index 7579d901d3..b799a98e56 100644 --- a/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts +++ b/target/linux/ramips/dts/mt7620a_buffalo_whr-600d.dts @@ -18,37 +18,37 @@ compatible = "gpio-leds"; power { - label = "whr-600d:red:power"; + label = "red:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wifi { - label = "whr-600d:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_power_green: power2 { - label = "whr-600d:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "whr-600d:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; internet { - label = "whr-600d:green:internet"; + label = "green:internet"; gpios = <&gpio2 17 GPIO_ACTIVE_LOW>; }; router { - label = "whr-600d:green:router"; + label = "green:router"; gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; }; router2 { - label = "whr-600d:orange:router"; + label = "orange:router"; gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi index adbb4cf65c..3ec31238b4 100644 --- a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi +++ b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi @@ -6,6 +6,14 @@ #include / { + aliases { + label-mac-device = ðernet; + led-boot = &led_power_green; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + keys { compatible = "gpio-keys"; @@ -21,6 +29,30 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power_green: power_green { + label = "green:power"; + gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + }; + + wan_orange { + label = "orange:wan"; + gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; + }; + + wan_green { + label = "green:wan"; + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + }; + + power_orange { + label = "orange:power"; + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; + }; + }; }; &spi0 { @@ -87,6 +119,13 @@ }; }; +&state_default { + gpio { + groups = "i2c", "uartf", "ephy"; + function = "gpio"; + }; +}; + ðernet { mtd-mac-address = <&factory 0x28>; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts index 5bc5b376c7..bbd193b4ac 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dch-m225.dts @@ -34,13 +34,13 @@ compatible = "gpio-leds"; led_power: power { - label = "dch-m225:green:power"; + label = "green:power"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; default-state = "on"; }; status { - label = "dch-m225:red:status"; + label = "red:status"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts index 0c0d9c9f33..6ad3f41560 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts @@ -40,12 +40,12 @@ compatible = "gpio-leds"; led_status: status { - label = "dir-510l:green:status"; + label = "green:status"; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; status-red { - label = "dir-510l:red:status"; + label = "red:status"; gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts index fa080a2403..12173d1e86 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts @@ -3,43 +3,4 @@ / { compatible = "dlink,dir-810l", "ralink,mt7620a-soc"; model = "D-Link DIR-810L"; - - aliases { - led-boot = &led_power_green; - led-failsafe = &led_power_green; - led-running = &led_power_green; - led-upgrade = &led_power_green; - label-mac-device = ðernet; - }; - - leds { - compatible = "gpio-leds"; - - led_power_green: power_green { - label = "dir-810l:green:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; - }; - - wan_orange { - label = "dir-810l:orange:wan"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - - wan_green { - label = "dir-810l:green:wan"; - gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; - }; - - power_orange { - label = "dir-810l:orange:power"; - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "uartf", "ephy"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts index ee62f3d49a..bacebee8e1 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts @@ -35,27 +35,27 @@ compatible = "gpio-leds"; wan { - label = "dwr-118-a1:green:wan"; + label = "green:wan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_internet: internet { - label = "dwr-118-a1:green:internet"; + label = "green:internet"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; lan { - label = "dwr-118-a1:green:lan"; + label = "green:lan"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "dwr-118-a1:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; usb { - label = "dwr-118-a1:green:usb"; + label = "green:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts index 296890ebd6..0b124e67de 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts @@ -32,27 +32,27 @@ compatible = "gpio-leds"; wan { - label = "dwr-118-a2:green:wan"; + label = "green:wan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_internet: internet { - label = "dwr-118-a2:green:internet"; + label = "green:internet"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; lan { - label = "dwr-118-a2:green:lan"; + label = "green:lan"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "dwr-118-a2:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; usb { - label = "dwr-118-a2:green:usb"; + label = "green:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts index ed0cc575eb..4284c61aa2 100644 --- a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts +++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts @@ -36,53 +36,53 @@ compatible = "gpio-leds"; led_status: status { - label = "dwr-960:green:status"; + label = "green:status"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wan { - label = "dwr-960:green:wan"; + label = "green:wan"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; lan { - label = "dwr-960:green:lan"; + label = "green:lan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; sms { - label = "dwr-960:green:sms"; + label = "green:sms"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; signal_green { - label = "dwr-960:green:signal"; + label = "green:signal"; gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; }; signal_red { - label = "dwr-960:red:signal"; + label = "red:signal"; gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; }; 4g { - label = "dwr-960:green:4g"; + label = "green:4g"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; 3g { - label = "dwr-960:green:3g"; + label = "green:3g"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "dwr-960:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan2g { - label = "dwr-960:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts index a0e72a4fae..4f25b34567 100644 --- a/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts +++ b/target/linux/ramips/dts/mt7620a_dovado_tiny-ac.dts @@ -11,14 +11,14 @@ compatible = "gpio-leds"; usb { - label = "tiny-ac:green:usb"; + label = "green:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "tiny-ac:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts index a90760eb6d..0b991611b2 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts @@ -41,22 +41,22 @@ compatible = "gpio-leds"; led_power: power { - label = "br-6478ac-v2:white:power"; + label = "white:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; internet { - label = "br-6478ac-v2:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wlan { - label = "br-6478ac-v2:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; usb { - label = "br-6478ac-v2:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts index cb0ce575ae..ebab7e4089 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7476rpc.dts @@ -5,40 +5,4 @@ / { compatible = "edimax,ew-7476rpc", "ralink,mt7620a-soc"; model = "Edimax EW-7476RPC"; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "ew-7476rpc:green:power"; - gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "ew-7476rpc:green:lan"; - gpios = <&gpio2 26 GPIO_ACTIVE_LOW>; - }; - - wlan2g { - label = "ew-7476rpc:blue:wlan2g"; - gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; - }; - - wlan5g { - label = "ew-7476rpc:blue:wlan5g"; - gpios = <&gpio2 31 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0radio"; - }; - - wps { - label = "ew-7476rpc:green:wps"; - gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; - }; - - crossband { - label = "ew-7476rpc:green:crossband"; - gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts index 160a8c26dd..a0fa2e3da8 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478ac.dts @@ -5,40 +5,4 @@ / { compatible = "edimax,ew-7478ac", "ralink,mt7620a-soc"; model = "Edimax EW-7478AC"; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "ew-7478ac:green:power"; - gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "ew-7478ac:green:lan"; - gpios = <&gpio2 26 GPIO_ACTIVE_LOW>; - }; - - wlan2g { - label = "ew-7478ac:blue:wlan2g"; - gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; - }; - - wlan5g { - label = "ew-7478ac:blue:wlan5g"; - gpios = <&gpio2 31 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0radio"; - }; - - wps { - label = "ew-7478ac:green:wps"; - gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; - }; - - crossband { - label = "ew-7478ac:green:crossband"; - gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts index 9d59755ac8..1e1b2830f0 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-7478apc.dts @@ -30,22 +30,22 @@ compatible = "gpio-leds"; led_power: power { - label = "ew-7478apc:white:power"; + label = "white:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; internet { - label = "ew-7478apc:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wlan { - label = "ew-7478apc:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; usb { - label = "ew-7478apc:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi index be83db2503..78b481bd2a 100644 --- a/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi +++ b/target/linux/ramips/dts/mt7620a_edimax_ew-747x.dtsi @@ -38,6 +38,42 @@ linux,input-type = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "green:power"; + gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "green:lan"; + gpios = <&gpio2 26 GPIO_ACTIVE_LOW>; + }; + + wlan2g { + label = "blue:wlan2g"; + gpios = <&gpio2 30 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + + wlan5g { + label = "blue:wlan5g"; + gpios = <&gpio2 31 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + + wps { + label = "green:wps"; + gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; + }; + + crossband { + label = "green:crossband"; + gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; + }; + }; }; &gpio1 { diff --git a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts index 4da1c9c708..807e18d62b 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_esr600.dts +++ b/target/linux/ramips/dts/mt7620a_engenius_esr600.dts @@ -24,22 +24,22 @@ compatible = "gpio-leds"; led_power: power { - label = "esr600:amber:power"; + label = "amber:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps2g { - label = "esr600:amber:wps2g"; + label = "amber:wps2g"; gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "esr600:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "esr600:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts b/target/linux/ramips/dts/mt7620a_fon_fon2601.dts index 1ed778f4f5..4dc0e28c9f 100644 --- a/target/linux/ramips/dts/mt7620a_fon_fon2601.dts +++ b/target/linux/ramips/dts/mt7620a_fon_fon2601.dts @@ -20,22 +20,22 @@ compatible = "gpio-leds"; led_power: power_r { - label = "fon2601:red:power"; + label = "red:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; internet_g { - label = "fon2601:green:internet"; + label = "green:internet"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; net_g { - label = "fon2601:green:net"; + label = "green:net"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wifi_g { - label = "fon2601:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts index 2c6ac0baf7..d4e0a81e9f 100644 --- a/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts +++ b/target/linux/ramips/dts/mt7620a_head-weblink_hdrm200.dts @@ -24,17 +24,17 @@ compatible = "gpio-leds"; rssi { - label = "hdrm200:red:rssi"; + label = "red:rssi"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; led_system: system { - label = "hdrm200:green:system"; + label = "green:system"; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; air { - label = "hdrm200:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts index 263bccd20a..90ce3c92d7 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5661.dts @@ -15,17 +15,17 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5661:blue:system"; + label = "blue:system"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; internet { - label = "hc5661:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "hc5661:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts index 9ad32000e2..5b67779984 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5761.dts @@ -15,23 +15,23 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5761:blue:system"; + label = "blue:system"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; internet { - label = "hc5761:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "hc5761:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wlan5g { - label = "hc5761:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts index d54248fd86..08163e56ba 100644 --- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts +++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts @@ -15,29 +15,29 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5861:blue:system"; + label = "blue:system"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "hc5861:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; internet { - label = "hc5861:blue:internet"; + label = "blue:internet"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "hc5861:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; turbo { - label = "hc5861:blue:turbo"; + label = "blue:turbo"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_hnet_c108.dts b/target/linux/ramips/dts/mt7620a_hnet_c108.dts index be0e0c0e99..d9c5c24287 100644 --- a/target/linux/ramips/dts/mt7620a_hnet_c108.dts +++ b/target/linux/ramips/dts/mt7620a_hnet_c108.dts @@ -66,27 +66,27 @@ compatible = "gpio-leds"; sdcard { - label = "c108:green:sdcard"; + label = "green:sdcard"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; modem_green { - label = "c108:green:modem"; + label = "green:modem"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; modem_red { - label = "c108:red:modem"; + label = "red:modem"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; lan_red { - label = "c108:red:lan"; + label = "red:lan"; gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; }; led_lan_green: lan_green { - label = "c108:green:lan"; + label = "green:lan"; gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts index 1ac294f06a..7044a511bc 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts @@ -20,23 +20,23 @@ compatible = "gpio-leds"; led_power: power { - label = "wn-ac1167gr:green:power"; + label = "green:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; default-state = "on"; }; wlan2g { - label = "wn-ac1167gr:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; notification { - label = "wn-ac1167gr:green:notification"; + label = "green:notification"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "wn-ac1167gr:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts index 150be50d44..e29431dc8d 100644 --- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts +++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts @@ -20,23 +20,23 @@ compatible = "gpio-leds"; led_power: power { - label = "wn-ac733gr3:green:power"; + label = "green:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; default-state = "on"; }; notification { - label = "wn-ac733gr3:green:notification"; + label = "green:notification"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "wn-ac733gr3:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "wn-ac733gr3:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_iptime_a1004ns.dts b/target/linux/ramips/dts/mt7620a_iptime_a1004ns.dts index d5e97bc153..20d0557916 100644 --- a/target/linux/ramips/dts/mt7620a_iptime_a1004ns.dts +++ b/target/linux/ramips/dts/mt7620a_iptime_a1004ns.dts @@ -17,12 +17,12 @@ compatible = "gpio-leds"; led_cpu: cpu { - label = "a1004ns:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; usb { - label = "a1004ns:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts index 0784061a97..c997d68cd1 100644 --- a/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts +++ b/target/linux/ramips/dts/mt7620a_iptime_a104ns.dts @@ -17,14 +17,14 @@ compatible = "gpio-leds"; usb { - label = "a104ns:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_cpu: cpu { - label = "a104ns:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts index 9c21d94d73..218dd7a761 100644 --- a/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts +++ b/target/linux/ramips/dts/mt7620a_kimax_u25awf-h1.dts @@ -28,12 +28,12 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "u25awf:red:wifi"; + label = "red:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; lan { - label = "u25awf:green:lan"; + label = "green:lan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts index 810c1bf856..d5fb543a63 100644 --- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts +++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts @@ -34,17 +34,17 @@ compatible = "gpio-leds"; led_status: status { - label = "lr-25g001:green:status"; + label = "green:status"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wifi2g { - label = "lr-25g001:green:wifi2g"; + label = "green:wifi2g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; wifi5g { - label = "lr-25g001:green:wifi5g"; + label = "green:wifi5g"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts index 5c198941f9..bb1303d4fb 100644 --- a/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts +++ b/target/linux/ramips/dts/mt7620a_lb-link_bl-w1200.dts @@ -29,7 +29,7 @@ compatible = "gpio-leds"; led_wps: wps { - label = "bl-w1200:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts index a232c92458..2bea987b42 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts @@ -16,34 +16,34 @@ compatible = "gpio-leds"; led_power: power { - label = "newifi-y1:blue:power"; + label = "blue:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan1 { - label = "newifi-y1:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; wlan2 { - label = "newifi-y1:blue:wifi5g"; + label = "blue:wifi5g"; gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; }; usb { - label = "newifi-y1:blue:usb"; + label = "blue:usb"; gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; lan { - label = "newifi-y1:blue:lan"; + label = "blue:lan"; gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; }; internet { - label = "newifi-y1:blue:internet"; + label = "blue:internet"; gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts index 979e96ca0e..a07683ed4a 100644 --- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts +++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts @@ -37,39 +37,39 @@ compatible = "gpio-leds"; power1 { - label = "newifi-y1s:yellow:power"; + label = "yellow:power"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; led_power_blue: power2 { - label = "newifi-y1s:blue:power"; + label = "blue:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan1 { - label = "newifi-y1s:yellow:wifi"; + label = "yellow:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; wlan2 { - label = "newifi-y1s:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; }; usb1 { - label = "newifi-y1s:yellow:usb"; + label = "yellow:usb"; gpios = <&gpio2 13 GPIO_ACTIVE_LOW>; }; usb2 { - label = "newifi-y1s:blue:usb"; + label = "blue:usb"; gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; internet { - label = "newifi-y1s:blue:internet"; + label = "blue:internet"; gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts index 9b6917baeb..01197aafd2 100644 --- a/target/linux/ramips/dts/mt7620a_linksys_e1700.dts +++ b/target/linux/ramips/dts/mt7620a_linksys_e1700.dts @@ -44,12 +44,12 @@ compatible = "gpio-leds"; led_power: power { - label = "e1700:green:power"; + label = "green:power"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; wan { - label = "e1700:green:wps"; + label = "green:wps"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts index b15a3e12ef..ec310dee22 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex2700.dts @@ -25,38 +25,38 @@ compatible = "gpio-leds"; led_power_green: power_g { - label = "ex2700:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; default-state = "on"; }; power_r { - label = "ex2700:red:power"; + label = "red:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; device_g { - label = "ex2700:green:device"; + label = "green:device"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; device_r { - label = "ex2700:red:device"; + label = "red:device"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; router_g { - label = "ex2700:green:router"; + label = "green:router"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; router_r { - label = "ex2700:red:router"; + label = "red:router"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wps { - label = "ex2700:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts b/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts index 8d6ee5b612..0ab84f7e27 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3700.dts @@ -5,51 +5,4 @@ / { compatible = "netgear,ex3700", "ralink,mt7620a-soc"; model = "Netgear EX3700/EX3800"; - - aliases { - led-boot = &led_power_amber; - led-failsafe = &led_power_amber; - led-running = &led_power_green; - led-upgrade = &led_power_green; - }; - - leds { - compatible = "gpio-leds"; - - led_power_green: power_green { - label = "ex3700:green:power"; - gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - led_power_amber: power_amber { - label = "ex3700:amber:power"; - gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; - }; - - router_green { - label = "ex3700:green:router"; - gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; - }; - - router_red { - label = "ex3700:red:router"; - gpios = <&gpio2 24 GPIO_ACTIVE_LOW>; - }; - - device_green { - label = "ex3700:green:device"; - gpios = <&gpio2 20 GPIO_ACTIVE_LOW>; - }; - - device_red { - label = "ex3700:red:device"; - gpios = <&gpio2 21 GPIO_ACTIVE_LOW>; - }; - - wps { - label = "ex3700:green:wps"; - gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi index 3cafd932ab..0f0d9aee7e 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi +++ b/target/linux/ramips/dts/mt7620a_netgear_ex3x00_ex61xx.dtsi @@ -4,6 +4,13 @@ #include / { + aliases { + led-boot = &led_power_amber; + led-failsafe = &led_power_amber; + led-running = &led_power_green; + led-upgrade = &led_power_green; + }; + keys { compatible = "gpio-keys"; @@ -19,6 +26,46 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power_green: power_green { + label = "green:power"; + gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led_power_amber: power_amber { + label = "amber:power"; + gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; + }; + + router_green { + label = "green:router"; + gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; + }; + + router_red { + label = "red:router"; + gpios = <&gpio2 24 GPIO_ACTIVE_LOW>; + }; + + device_green { + label = "green:device"; + gpios = <&gpio2 20 GPIO_ACTIVE_LOW>; + }; + + device_red { + label = "red:device"; + gpios = <&gpio2 21 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "green:wps"; + gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; + }; + }; }; &gpio0 { diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex6120.dts b/target/linux/ramips/dts/mt7620a_netgear_ex6120.dts index 58581e6706..2d376275a0 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex6120.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex6120.dts @@ -5,51 +5,4 @@ / { compatible = "netgear,ex6120", "ralink,mt7620a-soc"; model = "Netgear EX6120"; - - aliases { - led-boot = &led_power_amber; - led-failsafe = &led_power_amber; - led-running = &led_power_green; - led-upgrade = &led_power_green; - }; - - leds { - compatible = "gpio-leds"; - - led_power_green: power_green { - label = "ex6120:green:power"; - gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - led_power_amber: power_amber { - label = "ex6120:amber:power"; - gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; - }; - - router_green { - label = "ex6120:green:router"; - gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; - }; - - router_red { - label = "ex6120:red:router"; - gpios = <&gpio2 24 GPIO_ACTIVE_LOW>; - }; - - device_green { - label = "ex6120:green:device"; - gpios = <&gpio2 20 GPIO_ACTIVE_LOW>; - }; - - device_red { - label = "ex6120:red:device"; - gpios = <&gpio2 21 GPIO_ACTIVE_LOW>; - }; - - wps { - label = "ex6120:green:wps"; - gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts b/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts index 5994a10d42..0cb4dc6f27 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_ex6130.dts @@ -7,50 +7,6 @@ model = "Netgear EX6130"; aliases { - led-boot = &led_power_amber; - led-failsafe = &led_power_amber; - led-running = &led_power_green; - led-upgrade = &led_power_green; label-mac-device = ðernet; }; - - leds { - compatible = "gpio-leds"; - - led_power_green: power_green { - label = "ex6130:green:power"; - gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - led_power_amber: power_amber { - label = "ex6130:amber:power"; - gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; - }; - - router_green { - label = "ex6130:green:router"; - gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; - }; - - router_red { - label = "ex6130:red:router"; - gpios = <&gpio2 24 GPIO_ACTIVE_LOW>; - }; - - device_green { - label = "ex6130:green:device"; - gpios = <&gpio2 20 GPIO_ACTIVE_LOW>; - }; - - device_red { - label = "ex6130:red:device"; - gpios = <&gpio2 21 GPIO_ACTIVE_LOW>; - }; - - wps { - label = "ex6130:green:wps"; - gpios = <&gpio2 27 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts index 0028f26fdb..c9b1806243 100644 --- a/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts +++ b/target/linux/ramips/dts/mt7620a_netgear_wn3000rp-v3.dts @@ -17,48 +17,48 @@ compatible = "gpio-leds"; led_power_green: power_g { - label = "wn3000rp-v3:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; default-state = "on"; }; power_r { - label = "wn3000rp-v3:red:power"; + label = "red:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; client_g { - label = "wn3000rp-v3:green:client"; + label = "green:client"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; client_r { - label = "wn3000rp-v3:red:client"; + label = "red:client"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; router_g { - label = "wn3000rp-v3:green:router"; + label = "green:router"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; router_r { - label = "wn3000rp-v3:red:router"; + label = "red:router"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wps { - label = "wn3000rp-v3:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; l_arrow { - label = "wn3000rp-v3:blue:leftarrow"; + label = "blue:leftarrow"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; r_arrow { - label = "wn3000rp-v3:blue:rightarrow"; + label = "blue:rightarrow"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_netis_wf2770.dts b/target/linux/ramips/dts/mt7620a_netis_wf2770.dts index b58c8b55ad..ab8c61b1d8 100644 --- a/target/linux/ramips/dts/mt7620a_netis_wf2770.dts +++ b/target/linux/ramips/dts/mt7620a_netis_wf2770.dts @@ -13,7 +13,7 @@ compatible = "gpio-leds"; wlan { - label = "wf2770:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts index 0ce376b45d..908f89d149 100644 --- a/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts +++ b/target/linux/ramips/dts/mt7620a_ohyeah_oy-0001.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_power: powerled { - label = "oy-0001:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wifiled { - label = "oy-0001:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts index 8f1343e938..e01c60a695 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts @@ -19,17 +19,17 @@ compatible = "gpio-leds"; led_blue: blue { - label = "k2g:blue:status"; + label = "blue:status"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; yellow { - label = "k2g:yellow:status"; + label = "yellow:status"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; red { - label = "k2g:red:status"; + label = "red:status"; gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts index aa7b5907ee..ea87d64ecc 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1208.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_wps: wps { - label = "psg1208:white:wps"; + label = "white:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wlan { - label = "psg1208:white:wlan2g"; + label = "white:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi index f74506ea61..dbfec00f81 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi @@ -6,6 +6,13 @@ / { compatible = "phicomm,psg1218", "ralink,mt7620a-soc"; + aliases { + led-boot = &led_blue; + led-failsafe = &led_blue; + led-running = &led_blue; + led-upgrade = &led_blue; + }; + keys { compatible = "gpio-keys"; @@ -15,6 +22,26 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_blue: blue { + label = "blue:status"; + gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + yellow { + label = "yellow:status"; + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + }; + + red { + label = "red:status"; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + }; + }; }; &gpio0 { diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts index 7a6e10c733..baa0d8b261 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts @@ -3,33 +3,6 @@ / { compatible = "phicomm,psg1218a", "phicomm,psg1218", "ralink,mt7620a-soc"; model = "Phicomm PSG1218 rev.A"; - - aliases { - led-boot = &led_blue; - led-failsafe = &led_blue; - led-running = &led_blue; - led-upgrade = &led_blue; - }; - - leds { - compatible = "gpio-leds"; - - led_blue: blue { - label = "psg1218a:blue:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - yellow { - label = "psg1218a:yellow:status"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - red { - label = "psg1218a:red:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - }; }; &state_default { diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts index e2a49e068f..f7e70c92c8 100644 --- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts +++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts @@ -3,33 +3,6 @@ / { compatible = "phicomm,psg1218b", "phicomm,psg1218", "ralink,mt7620a-soc"; model = "Phicomm PSG1218 rev.B"; - - aliases { - led-boot = &led_blue; - led-failsafe = &led_blue; - led-running = &led_blue; - led-upgrade = &led_blue; - }; - - leds { - compatible = "gpio-leds"; - - led_blue: blue { - label = "psg1218b:blue:status"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - yellow { - label = "psg1218b:yellow:status"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - red { - label = "psg1218b:red:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; - }; - }; }; &state_default { diff --git a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts index c13d6bf210..089b74bbc6 100644 --- a/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts +++ b/target/linux/ramips/dts/mt7620a_planex_cs-qr10.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "cs-qr10:red:power"; + label = "red:power"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts index 6df13c3040..eb373e9aa2 100644 --- a/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts +++ b/target/linux/ramips/dts/mt7620a_planex_db-wrt01.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "db-wrt01:orange:power"; + label = "orange:power"; gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts index 50cf79b94f..df9c9689c3 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-750dhp.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; wps { - label = "mzk-750dhp:green:wps"; + label = "green:wps"; gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "mzk-750dhp:green:power"; + label = "green:power"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "mzk-750dhp:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts index 825964cdc0..5459886a3a 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex300np.dts @@ -18,32 +18,32 @@ compatible = "gpio-leds"; wifi { - label = "mzk-ex300np:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "mzk-ex300np:green:wps"; + label = "green:wps"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; rep { - label = "mzk-ex300np:blue:rep"; + label = "blue:rep"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; wifi1 { - label = "mzk-ex300np:blue:wifi1"; + label = "blue:wifi1"; gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "mzk-ex300np:blue:wifi2"; + label = "blue:wifi2"; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; wifi3 { - label = "mzk-ex300np:blue:wifi3"; + label = "blue:wifi3"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts index cac6dc9be4..457d4fd552 100644 --- a/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts +++ b/target/linux/ramips/dts/mt7620a_planex_mzk-ex750np.dts @@ -18,37 +18,37 @@ compatible = "gpio-leds"; led_power: power { - label = "mzk-ex750np:red:power"; + label = "red:power"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wifi { - label = "mzk-ex750np:red:wifi"; + label = "red:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; wps { - label = "mzk-ex750np:green:wps"; + label = "green:wps"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; rep { - label = "mzk-ex750np:blue:rep"; + label = "blue:rep"; gpios = <&gpio2 16 GPIO_ACTIVE_LOW>; }; wifi1 { - label = "mzk-ex750np:blue:wifi1"; + label = "blue:wifi1"; gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "mzk-ex750np:blue:wifi2"; + label = "blue:wifi2"; gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; }; wifi3 { - label = "mzk-ex750np:blue:wifi3"; + label = "blue:wifi3"; gpios = <&gpio2 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts index d37ed37172..8003ac9dc2 100644 --- a/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts +++ b/target/linux/ramips/dts/mt7620a_sanlinking_d240.dts @@ -72,19 +72,19 @@ compatible = "gpio-leds"; led_power: power { - label = "d240:blue:power"; + label = "blue:power"; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; usb { - label = "d240:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; air { - label = "d240:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts index 2d3e4cba05..0d96fd2901 100644 --- a/target/linux/ramips/dts/mt7620a_sercomm_na930.dts +++ b/target/linux/ramips/dts/mt7620a_sercomm_na930.dts @@ -78,24 +78,24 @@ compatible = "gpio-leds"; zwave { - label = "na930:blue:zwave"; + label = "blue:zwave"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; status { - label = "na930:blue:status"; + label = "blue:status"; gpios = <&gpio2 26 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; service { - label = "na930:blue:service"; + label = "blue:service"; gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "na930:blue:power"; + label = "blue:power"; gpios = <&gpio2 29 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts index 1c95325fb2..184af58d29 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts @@ -22,29 +22,29 @@ compatible = "gpio-leds"; lan { - label = "archer-c2-v1:green:lan"; + label = "green:lan"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; usb { - label = "archer-c2-v1:green:usb"; + label = "green:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "archer-c2-v1:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-c2-v1:green:wan"; + label = "green:wan"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; wlan { - label = "archer-c2-v1:green:wlan"; + label = "green:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts index 265592e336..f7e7d50df7 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts @@ -15,47 +15,47 @@ compatible = "gpio-leds"; lan { - label = "archer-c20-v1:blue:lan"; + label = "blue:lan"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "archer-c20-v1:blue:power"; + label = "blue:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; default-state = "keep"; }; usb { - label = "archer-c20-v1:blue:usb"; + label = "blue:usb"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { - label = "archer-c20-v1:blue:wan"; + label = "blue:wan"; gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; }; wan_orange { - label = "archer-c20-v1:orange:wan"; + label = "orange:wan"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; wlan5g { - label = "archer-c20-v1:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan2g { - label = "archer-c20-v1:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wps { - label = "archer-c20-v1:blue:wps"; + label = "blue:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts index 785b740861..a6c3cea736 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts @@ -16,29 +16,29 @@ compatible = "gpio-leds"; lan { - label = "archer-c20i:blue:lan"; + label = "blue:lan"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; usb { - label = "archer-c20i:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "archer-c20i:blue:wps"; + label = "blue:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-c20i:blue:wan"; + label = "blue:wan"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; wlan { - label = "archer-c20i:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts index b10d1ed30e..d564552ff0 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts @@ -15,47 +15,47 @@ compatible = "gpio-leds"; lan { - label = "archer-c50-v1:green:lan"; + label = "green:lan"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "archer-c50-v1:green:power"; + label = "green:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; default-state = "on"; }; usb { - label = "archer-c50-v1:green:usb"; + label = "green:usb"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { - label = "archer-c50-v1:green:wan"; + label = "green:wan"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "archer-c50-v1:orange:wan"; + label = "orange:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "archer-c50-v1:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan2g { - label = "archer-c50-v1:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wps { - label = "archer-c50-v1:green:wps"; + label = "green:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts index c1454a8e2b..ae92dc85e6 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_archer-mr200.dts @@ -22,52 +22,52 @@ compatible = "gpio-leds"; lan { - label = "archer-mr200:white:lan"; + label = "white:lan"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-mr200:white:wan"; + label = "white:wan"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "archer-mr200:white:power"; + label = "white:power"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; 4g { - label = "archer-mr200:white:4g"; + label = "white:4g"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wps { - label = "archer-mr200:white:wps"; + label = "white:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; signal1 { - label = "archer-mr200:white:signal1"; + label = "white:signal1"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; signal2 { - label = "archer-mr200:white:signal2"; + label = "white:signal2"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; signal3 { - label = "archer-mr200:white:signal3"; + label = "white:signal3"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; signal4 { - label = "archer-mr200:white:signal4"; + label = "white:signal4"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; wlan { - label = "archer-mr200:white:wlan"; + label = "white:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts index 8972dc2687..d2f5207fac 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_re200-v1.dts @@ -17,32 +17,32 @@ compatible = "gpio-leds"; led_power: power { - label = "re200-v1:green:power"; + label = "green:power"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; lan { - label = "re200-v1:green:lan"; + label = "green:lan"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; wlan { - label = "re200-v1:green:wlan"; + label = "green:wlan"; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; qss { - label = "re200-v1:green:qss"; + label = "green:qss"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; wlan2g_red { - label = "re200-v1:red:wlan2g"; + label = "red:wlan2g"; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; wlan2g_green { - label = "re200-v1:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts index 8668e0b84a..41e56fbe36 100644 --- a/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts +++ b/target/linux/ramips/dts/mt7620a_tplink_re210-v1.dts @@ -17,28 +17,28 @@ compatible = "gpio-leds"; led_power: power { - label = "re210-v1:green:power"; + label = "green:power"; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; rssi_high { - label = "re210-v1:green:rssi-high"; + label = "green:rssi-high"; gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; }; rssi_low { - label = "re210-v1:red:rssi-low"; + label = "red:rssi-low"; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "re210-v1:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wlan5g { - label = "re210-v1:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7620a_trendnet_tew-810dr.dts b/target/linux/ramips/dts/mt7620a_trendnet_tew-810dr.dts index 4c93c44d0e..767da53f65 100644 --- a/target/linux/ramips/dts/mt7620a_trendnet_tew-810dr.dts +++ b/target/linux/ramips/dts/mt7620a_trendnet_tew-810dr.dts @@ -5,43 +5,4 @@ / { compatible = "trendnet,tew-810dr", "ralink,mt7620a-soc"; model = "TRENDnet TEW-810DR"; - - aliases { - led-boot = &led_power_green; - led-failsafe = &led_power_green; - led-running = &led_power_green; - led-upgrade = &led_power_green; - label-mac-device = ðernet; - }; - - leds { - compatible = "gpio-leds"; - - led_power_green: power_green { - label = "tew-810dr:green:power"; - gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; - }; - - wan_orange { - label = "tew-810dr:orange:wan"; - gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; - }; - - wan_green { - label = "tew-810dr:green:wan"; - gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; - }; - - power_orange { - label = "tew-810dr:orange:power"; - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; - }; - }; -}; - -&state_default { - gpio { - groups = "i2c", "uartf", "ephy"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts index bce257dc7f..14cbc1830f 100644 --- a/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts +++ b/target/linux/ramips/dts/mt7620a_xiaomi_miwifi-mini.dts @@ -23,18 +23,18 @@ compatible = "gpio-leds"; led_blue: blue { - label = "miwifi-mini:blue:status"; + label = "blue:status"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; default-state = "on"; }; yellow { - label = "miwifi-mini:yellow:status"; + label = "yellow:status"; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; red { - label = "miwifi-mini:red:status"; + label = "red:status"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 522838156b..64eac1df36 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -18,24 +18,24 @@ compatible = "gpio-leds"; wan { - label = "yk1:blue:wan"; + label = "blue:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; air { - label = "yk1:blue:air"; + label = "blue:air"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; usb { - label = "yk1:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: power { - label = "yk1:blue:power"; + label = "blue:power"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts index d8c3047a8c..aaa35a72b2 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-ape522ii.dts @@ -15,27 +15,27 @@ compatible = "gpio-leds"; sys1 { - label = "zbt-ape522ii:green:sys1"; + label = "green:sys1"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; sys2 { - label = "zbt-ape522ii:green:sys2"; + label = "green:sys2"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; sys3 { - label = "zbt-ape522ii:green:sys3"; + label = "green:sys3"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; sys4 { - label = "zbt-ape522ii:green:sys4"; + label = "green:sys4"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wlan2g4 { - label = "zbt-ape522ii:green:wlan2g4"; + label = "green:wlan2g4"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi index b594cab2c3..4991897ca4 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-5g.dtsi @@ -10,19 +10,19 @@ compatible = "gpio-leds"; lan { - label = "we1026-5g:green:lan"; + label = "green:lan"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; usb { - label = "we1026-5g:green:usb"; + label = "green:usb"; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "we1026-5g:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-h.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-h.dtsi index f8f9bc754a..09f0ba773c 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-h.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we1026-h.dtsi @@ -10,22 +10,22 @@ compatible = "gpio-leds"; usb { - label = "we1026-h:green:usb"; + label = "green:usb"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; lan { - label = "we1026-h:green:lan"; + label = "green:lan"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wan { - label = "we1026-h:green:wan"; + label = "green:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; wifi { - label = "we1026-h:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts index b6d6a99800..bce6afe263 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826-e.dts @@ -12,22 +12,22 @@ compatible = "gpio-leds"; led_power: gsm { - label = "zbt-we826-e:blue:gsm"; + label = "blue:gsm"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; signal { - label = "zbt-we826-e:green:signal"; + label = "green:signal"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; sim { - label = "zbt-we826-e:red:sim"; + label = "red:sim"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; air { - label = "zbt-we826-e:red:wifi"; + label = "red:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi index 0e3d689b4f..3e612badc3 100644 --- a/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi +++ b/target/linux/ramips/dts/mt7620a_zbtlink_zbt-we826.dtsi @@ -21,19 +21,19 @@ compatible = "gpio-leds"; led_power: power { - label = "zbt-we826:green:power"; + label = "green:power"; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; usb { - label = "zbt-we826:green:usb"; + label = "green:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; air { - label = "zbt-we826:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zte_q7.dts b/target/linux/ramips/dts/mt7620a_zte_q7.dts index 6cb2c8b225..dd9a87d5af 100644 --- a/target/linux/ramips/dts/mt7620a_zte_q7.dts +++ b/target/linux/ramips/dts/mt7620a_zte_q7.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; statred { - label = "zte-q7:red:status"; + label = "red:status"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; led_status_blue: statblue { - label = "zte-q7:blue:status"; + label = "blue:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts index 7f997eb97c..8c07de4845 100644 --- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts +++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts @@ -18,29 +18,29 @@ compatible = "gpio-leds"; wan { - label = "keenetic-viva:green:wan"; + label = "green:wan"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; usb { - label = "keenetic-viva:green:usb"; + label = "green:usb"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; power_alert { - label = "keenetic-viva:red:power"; + label = "red:power"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; wifi { - label = "keenetic-viva:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_power_green: power { - label = "keenetic-viva:green:power"; + label = "green:power"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts index 7a3105f9be..24a8779b27 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n12p.dts @@ -22,22 +22,22 @@ compatible = "gpio-leds"; wan { - label = "rt-n12p:green:wan"; + label = "green:wan"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; lan { - label = "rt-n12p:green:lan"; + label = "green:lan"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "rt-n12p:green:power"; + label = "green:power"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; air { - label = "rt-n12p:green:air"; + label = "green:air"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts index 13614640e6..ce51ff89b3 100644 --- a/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts +++ b/target/linux/ramips/dts/mt7620n_asus_rt-n14u.dts @@ -18,29 +18,29 @@ compatible = "gpio-leds"; wan { - label = "rt-n14u:blue:wan"; + label = "blue:wan"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; lan { - label = "rt-n14u:blue:lan"; + label = "blue:lan"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; usb { - label = "rt-n14u:blue:usb"; + label = "blue:usb"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: power { - label = "rt-n14u:blue:power"; + label = "blue:power"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; air { - label = "rt-n14u:blue:air"; + label = "blue:air"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts index 8fc39cb914..26803c0c2a 100644 --- a/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts +++ b/target/linux/ramips/dts/mt7620n_buffalo_wmr-300.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; aoss1 { - label = "wmr-300:red:aoss"; + label = "red:aoss"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; aoss2 { - label = "wmr-300:green:aoss"; + label = "green:aoss"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "wmr-300:green:status"; + label = "green:status"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts index 6a24c5d75c..17d9a68623 100644 --- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts +++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts @@ -22,17 +22,17 @@ compatible = "gpio-leds"; ethernet { - label = "cf-wr800n:white:ethernet"; + label = "white:ethernet"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; wifi { - label = "cf-wr800n:white:wifi"; + label = "white:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "cf-wr800n:white:wps"; + label = "white:wps"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts index b387e3d811..2467a766a3 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-116-a1.dts @@ -34,12 +34,12 @@ compatible = "gpio-leds"; led_status: status { - label = "dwr-116-a1:green:status"; + label = "green:status"; gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; }; wifi { - label = "dwr-116-a1:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts index b64a9f7f2f..c784839c34 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-921-c1.dts @@ -32,37 +32,37 @@ compatible = "gpio-leds"; sms { - label = "dwr-921-c1:green:sms"; + label = "green:sms"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; lan { - label = "dwr-921-c1:green:lan"; + label = "green:lan"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; }; led_sstrenghg: sstrengthg { - label = "dwr-921-c1:green:sigstrength"; + label = "green:sigstrength"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; sstrengthr { - label = "dwr-921-c1:red:sigstrength"; + label = "red:sigstrength"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; 4g { - label = "dwr-921-c1:green:4g"; + label = "green:4g"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; 3g { - label = "dwr-921-c1:green:3g"; + label = "green:3g"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wifi { - label = "dwr-921-c1:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts index 83c9fc8645..9400394d89 100644 --- a/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts +++ b/target/linux/ramips/dts/mt7620n_dlink_dwr-922-e2.dts @@ -35,37 +35,37 @@ led-boot = &sstrengthg; sms { - label = "dwr-922-e2:green:sms"; + label = "green:sms"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; lan { - label = "dwr-922-e2:green:lan"; + label = "green:lan"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; }; sstrengthg: sstrengthg { - label = "dwr-922-e2:green:sigstrength"; + label = "green:sigstrength"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; sstrengthr { - label = "dwr-922-e2:red:sigstrength"; + label = "red:sigstrength"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; 4g { - label = "dwr-922-e2:green:4g"; + label = "green:4g"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; 3g { - label = "dwr-922-e2:green:3g"; + label = "green:3g"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wifi { - label = "dwr-922-e2:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts index 1d4efcc592..6c6e98fdd4 100644 --- a/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts +++ b/target/linux/ramips/dts/mt7620n_elecom_wrh-300cr.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; led_wps: wps { - label = "wrh-300cr:green:wps"; + label = "green:wps"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; ethernet { - label = "wrh-300cr:green:ethernet"; + label = "green:ethernet"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wlan { - label = "wrh-300cr:green:wlan"; + label = "green:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts b/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts index 25a5e12f4e..1c408bcaa1 100644 --- a/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts +++ b/target/linux/ramips/dts/mt7620n_hootoo_ht-tm05.dts @@ -17,13 +17,13 @@ compatible = "gpio-leds"; led_power: power { - label = "ht-tm05:blue:power"; + label = "blue:power"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; default-state = "on"; }; wifi { - label = "ht-tm05:green:wifi"; + label = "green:wifi"; gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts index e5af6bf39a..7d6d80038c 100644 --- a/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts +++ b/target/linux/ramips/dts/mt7620n_kimax_u35wf.dts @@ -28,12 +28,12 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "u35wf:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; lan { - label = "u35wf:green:eth"; + label = "green:eth"; gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts index 24b3df4696..dcd38fc8d6 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlw221.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_system: system { - label = "mlw221:blue:system"; + label = "blue:system"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wifi { - label = "mlw221:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts index 79a695baac..3410077ce5 100644 --- a/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts +++ b/target/linux/ramips/dts/mt7620n_kingston_mlwg2.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_system: system { - label = "mlwg2:blue:system"; + label = "blue:system"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; wifi { - label = "mlwg2:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts index d66574bb03..63cf38dec5 100644 --- a/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts +++ b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts @@ -18,38 +18,38 @@ compatible = "gpio-leds"; led_power: power { - label = "jwnr2010-v5:green:power"; + label = "green:power"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; wan { - label = "jwnr2010-v5:green:wan"; + label = "green:wan"; gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>; }; wlan { - label = "jwnr2010-v5:green:wlan"; + label = "green:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; lan1 { - label = "jwnr2010-v5:green:lan1"; + label = "green:lan1"; gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; }; lan2 { - label = "jwnr2010-v5:green:lan2"; + label = "green:lan2"; gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; }; lan3 { - label = "jwnr2010-v5:green:lan3"; + label = "green:lan3"; gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; lan4 { - label = "jwnr2010-v5:green:lan4"; + label = "green:lan4"; gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi index 9762472355..0a724c048b 100644 --- a/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi +++ b/target/linux/ramips/dts/mt7620n_nexx_wt3020.dtsi @@ -28,7 +28,7 @@ compatible = "gpio-leds"; led_power: power { - label = "wt3020:blue:power"; + label = "blue:power"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts index e98184e7ac..320d61f65c 100644 --- a/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts +++ b/target/linux/ramips/dts/mt7620n_ravpower_rp-wd03.dts @@ -15,12 +15,12 @@ compatible = "gpio-leds"; wifi_green { - label = "rp-wd03:green:wifi"; + label = "green:wifi"; gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; }; led_wifi_blue: wifi_blue { - label = "rp-wd03:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts index cc5e06b1b5..8fa05a0793 100644 --- a/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts +++ b/target/linux/ramips/dts/mt7620n_vonets_var11n-300.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_system: system { - label = "var11n-300:blue:system"; + label = "blue:system"; gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts index f2b2345ac7..3ac7296f75 100644 --- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts +++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts @@ -17,7 +17,7 @@ compatible = "gpio-leds"; led_indicator: indicator { - label = "wrtnode:blue:indicator"; + label = "blue:indicator"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts index fbbadf6dba..35bada9a24 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-cpe102.dts @@ -20,17 +20,17 @@ compatible = "gpio-leds"; led_4g_0: 4g-0 { - label = "zbt-cpe102:green:4g-0"; + label = "green:4g-0"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; 4g-1 { - label = "zbt-cpe102:green:4g-1"; + label = "green:4g-1"; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; 4g-2 { - label = "zbt-cpe102:green:4g-2"; + label = "green:4g-2"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts index f3e391e950..a6ef51dabb 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wa05.dts @@ -22,19 +22,19 @@ compatible = "gpio-leds"; led_power: power { - label = "zbt-wa05:blue:power"; + label = "blue:power"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; usb { - label = "zbt-wa05:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; air { - label = "zbt-wa05:blue:air"; + label = "blue:air"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts index d547923b48..fe1799885a 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-we2026.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_power: power { - label = "zbt-we2026:red:power"; + label = "red:power"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; wlan { - label = "zbt-we2026:green:wlan"; + label = "green:wlan"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts index c2692467c5..af3ac4b009 100644 --- a/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts +++ b/target/linux/ramips/dts/mt7620n_zbtlink_zbt-wr8305rt.dts @@ -18,19 +18,19 @@ compatible = "gpio-leds"; led_sys: sys { - label = "zbt-wr8305rt:green:sys"; + label = "green:sys"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; lan { - label = "zbt-wr8305rt:green:usb"; + label = "green:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "zbt-wr8305rt:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts index a9c4e922d6..4e5c68ef3f 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni-ii.dts @@ -18,24 +18,24 @@ compatible = "gpio-leds"; wan { - label = "keenetic-omni-ii:green:wan"; + label = "green:wan"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; usb { - label = "keenetic-omni-ii:green:usb"; + label = "green:usb"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "keenetic-omni-ii:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "keenetic-omni-ii:green:power"; + label = "green:power"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts index a238d7ae91..e43f1357dd 100644 --- a/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts +++ b/target/linux/ramips/dts/mt7620n_zyxel_keenetic-omni.dts @@ -18,24 +18,24 @@ compatible = "gpio-leds"; wan { - label = "keenetic-omni:green:wan"; + label = "green:wan"; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; usb { - label = "keenetic-omni:green:usb"; + label = "green:usb"; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "keenetic-omni:green:wifi"; + label = "green:wifi"; gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "keenetic-omni:green:power"; + label = "green:power"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts index dba6ddbff8..3290a5e710 100644 --- a/target/linux/ramips/dts/mt7621_adslr_g7.dts +++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts @@ -21,7 +21,7 @@ compatible = "gpio-leds"; led_sys: sys { - label = "g7:blue:sys"; + label = "blue:sys"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts index 56016ed0f5..ed9e9852d3 100644 --- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts +++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts @@ -28,12 +28,12 @@ compatible = "gpio-leds"; led_run: run { - label = "ew1200:green:run"; + label = "green:run"; gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; }; usb { - label = "ew1200:green:usb"; + label = "green:usb"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts index 6fc8eb3081..e457dfcdbe 100644 --- a/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts +++ b/target/linux/ramips/dts/mt7621_alfa-network_quad-e4g.dts @@ -112,28 +112,28 @@ compatible = "gpio-leds"; led_system: system { - label = "quad-e4g:red:system"; + label = "red:system"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "keep"; }; m2 { - label = "quad-e4g:orange:m2"; + label = "orange:m2"; gpios = <&gpio 33 GPIO_ACTIVE_LOW>; }; minipcie0 { - label = "quad-e4g:orange:minipcie0"; + label = "orange:minipcie0"; gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; minipcie1 { - label = "quad-e4g:orange:minipcie1"; + label = "orange:minipcie1"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; minipcie2 { - label = "quad-e4g:orange:minipcie2"; + label = "orange:minipcie2"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi index bc54d14083..b011c7ae2a 100644 --- a/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi +++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621.dtsi @@ -20,12 +20,12 @@ compatible = "gpio-leds"; wlan1 { - label = "ap7621-001:orange:wlan1"; + label = "orange:wlan1"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan0 { - label = "ap7621-001:orange:wlan0"; + label = "orange:wlan0"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts index bfbb47fe66..78f5584b4c 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac57u.dts @@ -20,12 +20,12 @@ compatible = "gpio-leds"; led_power: power { - label = "rt-ac57u:blue:power"; + label = "blue:power"; gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; usb { - label = "rt-ac57u:blue:usb"; + label = "blue:usb"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts index 6bdacb6349..9be178ecd3 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac65p.dts @@ -5,32 +5,4 @@ / { compatible = "asus,rt-ac65p", "mediatek,mt7621-soc"; model = "ASUS RT-AC65P"; - - 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 = "rt-ac65p:blue:power"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - wlan5g { - label = "rt-ac65p:blue:wlan5g"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; - }; - - wlan2g { - label = "rt-ac65p:blue:wlan2g"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0radio"; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts b/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts index be29697f73..cc8e0c2c44 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts +++ b/target/linux/ramips/dts/mt7621_asus_rt-ac85p.dts @@ -5,32 +5,4 @@ / { compatible = "asus,rt-ac85p", "mediatek,mt7621-soc"; model = "ASUS RT-AC85P"; - - 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 = "rt-ac85p:blue:power"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - wlan5g { - label = "rt-ac85p:blue:wlan5g"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1radio"; - }; - - wlan2g { - label = "rt-ac85p:blue:wlan2g"; - gpios = <&gpio 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0radio"; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi index f31e74b051..b5e8655cb9 100644 --- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi +++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi @@ -6,6 +6,13 @@ #include / { + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + keys { compatible = "gpio-keys"; @@ -21,6 +28,27 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "blue:power"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + wlan5g { + label = "blue:wlan5g"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1radio"; + }; + + wlan2g { + label = "blue:wlan2g"; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0radio"; + }; + }; }; &i2c { diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts index 21c763c1e1..f9211463f8 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-1166dhp.dts @@ -18,42 +18,42 @@ compatible = "gpio-leds"; internet_g { - label = "wsr-1166:green:internet"; + label = "green:internet"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; router_g { - label = "wsr-1166:green:router"; + label = "green:router"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; router_o { - label = "wsr-1166:orange:router"; + label = "orange:router"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; internet_o { - label = "wsr-1166:orange:internet"; + label = "orange:internet"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wifi_o { - label = "wsr-1166:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wsr-1166:green:power"; + label = "green:power"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; diag { - label = "wsr-1166:orange:diag"; + label = "orange:diag"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; wifi_g { - label = "wsr-1166:green:wifi"; + label = "green:wifi"; gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts index 9b921af757..048eac5a3d 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts @@ -21,42 +21,42 @@ compatible = "gpio-leds"; internet_green { - label = "wsr-2533dhpl:green:internet"; + label = "green:internet"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; router_green { - label = "wsr-2533dhpl:green:router"; + label = "green:router"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; router_amber { - label = "wsr-2533dhpl:amber:router"; + label = "amber:router"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; internet_amber { - label = "wsr-2533dhpl:amber:internet"; + label = "amber:internet"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wireless_amber { - label = "wsr-2533dhpl:amber:wireless"; + label = "amber:wireless"; gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wsr-2533dhpl:green:power"; + label = "green:power"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; led_diag: diag { - label = "wsr-2533dhpl:amber:diag"; + label = "amber:diag"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; wireless_green { - label = "wsr-2533dhpl:green:wireless"; + label = "green:wireless"; gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts index a25a56c0dd..7392b1d7c1 100644 --- a/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts +++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-600dhp.dts @@ -18,42 +18,42 @@ compatible = "gpio-leds"; led_power: power { - label = "wsr-600:green:power"; + label = "green:power"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; wifi_o { - label = "wsr-600:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; diag { - label = "wsr-600:orange:diag"; + label = "orange:diag"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wifi_g { - label = "wsr-600:green:wifi"; + label = "green:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; router_o { - label = "wsr-600:orange:router"; + label = "orange:router"; gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; router_g { - label = "wsr-600:green:router"; + label = "green:router"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; internet_o { - label = "wsr-600:orange:internet"; + label = "orange:internet"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; internet_g { - label = "wsr-600:green:internet"; + label = "green:internet"; gpios = <&gpio 48 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts index 34b43ff5cc..5622855f48 100644 --- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts +++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts @@ -23,37 +23,37 @@ compatible = "gpio-leds"; power-amber { - label = "newifi-d2:amber:power"; + label = "amber:power"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_power_blue: power-blue { - label = "newifi-d2:blue:power"; + label = "blue:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; internet-amber { - label = "newifi-d2:amber:internet"; + label = "amber:internet"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; internet-blue { - label = "newifi-d2:blue:internet"; + label = "blue:internet"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "newifi-d2:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "newifi-d2:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; usb { - label = "newifi-d2:blue:usb"; + label = "blue:usb"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts index 0d939f5883..2fcdce5f19 100644 --- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts +++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts @@ -22,28 +22,28 @@ compatible = "gpio-leds"; power { - label = "pbr-m1:blue:power"; + label = "blue:power"; gpios = <&gpio 31 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_sys: sys { - label = "pbr-m1:blue:sys"; + label = "blue:sys"; gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; internet { - label = "pbr-m1:blue:internet"; + label = "blue:internet"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "pbr-m1:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 33 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "pbr-m1:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts index 14974c8c4a..0f4fbc1873 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts @@ -5,43 +5,14 @@ / { compatible = "dlink,dir-1960-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-1960 A1"; +}; - aliases { - led-boot = &led_power_orange; - led-failsafe = &led_power_white; - led-running = &led_power_white; - led-upgrade = &led_net_orange; - }; - - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - label = "dir-1960-a1:orange:power"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_white: power_white { - label = "dir-1960-a1:white:power"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "dir-1960-a1:orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_white { - label = "dir-1960-a1:white:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - usb_white { - label = "dir-1960-a1:white:usb"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - trigger-sources = <&xhci_ehci_port1>; - linux,default-trigger = "usbport"; - }; +&leds { + usb_white { + label = "white:usb"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + trigger-sources = <&xhci_ehci_port1>; + linux,default-trigger = "usbport"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts index c185285eb6..fbf233d96f 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts @@ -5,50 +5,21 @@ / { compatible = "dlink,dir-2660-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-2660 A1"; +}; - aliases { - led-boot = &led_power_orange; - led-failsafe = &led_power_white; - led-running = &led_power_white; - led-upgrade = &led_net_orange; +&leds { + usb2_white { + label = "white:usb2"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + trigger-sources = <&ehci_port2>; + linux,default-trigger = "usbport"; }; - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - label = "dir-2660-a1:orange:power"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_white: power_white { - label = "dir-2660-a1:white:power"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "dir-2660-a1:orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_white { - label = "dir-2660-a1:white:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - usb2_white { - label = "dir-2660-a1:white:usb2"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - trigger-sources = <&ehci_port2>; - linux,default-trigger = "usbport"; - }; - - usb3_white { - label = "dir-2660-a1:white:usb3"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - trigger-sources = <&xhci_ehci_port1>; - linux,default-trigger = "usbport"; - }; + usb3_white { + label = "white:usb3"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + trigger-sources = <&xhci_ehci_port1>; + linux,default-trigger = "usbport"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts index 68146b0518..5d1c336736 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-860l-b1.dts @@ -19,22 +19,22 @@ compatible = "gpio-leds"; power { - label = "dir-860l-b1:orange:power"; + label = "orange:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_power_green: power2 { - label = "dir-860l-b1:green:power"; + label = "green:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; net { - label = "dir-860l-b1:orange:net"; + label = "orange:net"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; net2 { - label = "dir-860l-b1:green:net"; + label = "green:net"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts index 060f7a47c0..b2ba5ecaa9 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts @@ -5,35 +5,4 @@ / { compatible = "dlink,dir-867-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-867 A1"; - - aliases { - led-boot = &led_power_orange; - led-failsafe = &led_power_green; - led-running = &led_power_green; - led-upgrade = &led_net_orange; - }; - - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - label = "dir-867-a1:orange:power"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_green: power_green { - label = "dir-867-a1:green:power"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "dir-867-a1:orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_green { - label = "dir-867-a1:green:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts index 05a6a6543f..4bfe5ca43c 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts @@ -5,35 +5,4 @@ / { compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-878 A1"; - - aliases { - led-boot = &led_power_orange; - led-failsafe = &led_power_green; - led-running = &led_power_green; - led-upgrade = &led_net_orange; - }; - - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - label = "dir-878-a1:orange:power"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_green: power_green { - label = "dir-878-a1:green:power"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "dir-878-a1:orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_green { - label = "dir-878-a1:green:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts index 07a257be70..bc2c6dfe86 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts @@ -5,49 +5,20 @@ / { compatible = "dlink,dir-882-a1", "mediatek,mt7621-soc"; model = "D-Link DIR-882 A1"; +}; - aliases { - led-boot = &led_power_orange; - led-failsafe = &led_power_green; - led-running = &led_power_green; - led-upgrade = &led_net_orange; +&leds { + usb2 { + label = "green:usb2"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + trigger-sources = <&ehci_port2>; + linux,default-trigger = "usbport"; }; - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - label = "dir-882-a1:orange:power"; - gpios = <&gpio 8 GPIO_ACTIVE_LOW>; - }; - - led_power_green: power_green { - label = "dir-882-a1:green:power"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - led_net_orange: net_orange { - label = "dir-882-a1:orange:net"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - net_green { - label = "dir-882-a1:green:net"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - usb2 { - label = "dir-882-a1:green:usb2"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - trigger-sources = <&ehci_port2>; - linux,default-trigger = "usbport"; - }; - - usb3 { - label = "dir-882-a1:green:usb3"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - trigger-sources = <&xhci_ehci_port1>; - linux,default-trigger = "usbport"; - }; + usb3 { + label = "green:usb3"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + trigger-sources = <&xhci_ehci_port1>; + linux,default-trigger = "usbport"; }; }; diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi index 9320967e71..e451d6a39f 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi @@ -8,6 +8,10 @@ / { aliases { label-mac-device = &gmac0; + led-boot = &led_power_orange; + led-failsafe = &led_power_green; + led-running = &led_power_green; + led-upgrade = &led_net_orange; }; keys { @@ -31,6 +35,30 @@ linux,code = ; }; }; + + leds: leds { + compatible = "gpio-leds"; + + led_power_orange: power_orange { + label = "orange:power"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + }; + + led_power_green: power_green { + label = "green:power"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + led_net_orange: net_orange { + label = "orange:net"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + net_green { + label = "green:net"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi index e194592b57..96c6921124 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi +++ b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi @@ -8,6 +8,10 @@ / { aliases { label-mac-device = &gmac0; + led-boot = &led_power_orange; + led-failsafe = &led_power_white; + led-running = &led_power_white; + led-upgrade = &led_net_orange; }; keys { @@ -25,6 +29,30 @@ linux,code = ; }; }; + + leds: leds { + compatible = "gpio-leds"; + + led_power_orange: power_orange { + label = "orange:power"; + gpios = <&gpio 8 GPIO_ACTIVE_LOW>; + }; + + led_power_white: power_white { + label = "white:power"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + led_net_orange: net_orange { + label = "orange:net"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + net_white { + label = "white:net"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + }; }; &nand { diff --git a/target/linux/ramips/dts/mt7621_edimax_ra21s.dts b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts index 8938db5107..1aea949004 100644 --- a/target/linux/ramips/dts/mt7621_edimax_ra21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_ra21s.dts @@ -5,35 +5,4 @@ / { compatible = "edimax,ra21s", "mediatek,mt7621-soc"; model = "Edimax RA21S"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - led_power: led_1 { - label = "ra21s:red:led1"; - gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; - }; - - led_2 { - label = "ra21s:red:led2"; - gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; - }; - - led_3 { - label = "ra21s:red:led3"; - gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; - }; - - led_4 { - label = "ra21s:red:led4"; - gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_re23s.dts b/target/linux/ramips/dts/mt7621_edimax_re23s.dts index e79b5bb2d2..cf44746e8f 100644 --- a/target/linux/ramips/dts/mt7621_edimax_re23s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_re23s.dts @@ -21,22 +21,22 @@ compatible = "gpio-leds"; led_power: power { - label = "re23s:green:power"; + label = "green:power"; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; wifi_green { - label = "re23s:green:wifi"; + label = "green:wifi"; gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; wifi_amber { - label = "re23s:amber:wifi"; + label = "amber:wifi"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_wifi_red: wifi_red { - label = "re23s:red:wifi"; + label = "red:wifi"; gpios = <&gpio 6 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts index 0180c5b8cb..6ac01dd86d 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rg21s.dts +++ b/target/linux/ramips/dts/mt7621_edimax_rg21s.dts @@ -5,35 +5,4 @@ / { compatible = "edimax,rg21s", "mediatek,mt7621-soc"; model = "Edimax RG21S"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - led_power: led_1 { - label = "rg21s:red:led1"; - gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; - }; - - led_2 { - label = "rg21s:red:led2"; - gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; - }; - - led_3 { - label = "rg21s:red:led3"; - gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; - }; - - led_4 { - label = "rg21s:red:led4"; - gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi index 4f30972f60..3f3bae43f1 100644 --- a/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi +++ b/target/linux/ramips/dts/mt7621_edimax_rx21s.dtsi @@ -8,6 +8,10 @@ / { aliases { label-mac-device = &gmac0; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -25,6 +29,30 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: led_1 { + label = "red:led1"; + gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + }; + + led_2 { + label = "red:led2"; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; + }; + + led_3 { + label = "red:led3"; + gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; + }; + + led_4 { + label = "red:led4"; + gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; + }; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts index 4d8e20d9f2..b6a7383557 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts @@ -18,33 +18,33 @@ compatible = "gpio-leds"; wlan2g { - label = "wrc-1167ghbk2-s:white:wlan2g"; + label = "white:wlan2g"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan5g { - label = "wrc-1167ghbk2-s:white:wlan5g"; + label = "white:wlan5g"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; led_power_green: power_green { - label = "wrc-1167ghbk2-s:green:power"; + label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; power_blue { - label = "wrc-1167ghbk2-s:blue:power"; + label = "blue:power"; gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; wps { - label = "wrc-1167ghbk2-s:red:wps"; + label = "red:wps"; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; power_red { - label = "wrc-1167ghbk2-s:red:power"; + label = "red:power"; gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi index a9ed9f6a41..fd54ead0bc 100644 --- a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi +++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi @@ -18,22 +18,22 @@ compatible = "gpio-leds"; led_power_green: power_green { - label = "wrc-gst:green:power"; + label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; power_blue { - label = "wrc-gst:blue:power"; + label = "blue:power"; gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; wps { - label = "wrc-gst:red:wps"; + label = "red:wps"; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; power_red { - label = "wrc-gst:red:power"; + label = "red:power"; gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts index e0a4634547..62423f02e5 100644 --- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts +++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "firewrt:green:power"; + label = "green:power"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts index 97488b2d7a..e7b19fa42c 100644 --- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts +++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts @@ -13,12 +13,12 @@ compatible = "gpio-leds"; internet { - label = "ghl-r-001:blue:internet"; + label = "blue:internet"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; usb { - label = "ghl-r-001:blue:usb"; + label = "blue:usb"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts index 4f0152e364..c218521c03 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc1.dts @@ -28,22 +28,22 @@ compatible = "gpio-leds"; system { - label = "gb-pc1:green:system"; + label = "green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "gb-pc1:green:status"; + label = "green:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; lan1 { - label = "gb-pc1:green:lan1"; + label = "green:lan1"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; lan2 { - label = "gb-pc1:green:lan2"; + label = "green:lan2"; gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts index e617f43255..613524d1da 100644 --- a/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts +++ b/target/linux/ramips/dts/mt7621_gnubee_gb-pc2.dts @@ -28,32 +28,32 @@ compatible = "gpio-leds"; system { - label = "gb-pc2:green:system"; + label = "green:system"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "gb-pc2:green:status"; + label = "green:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; lan1 { - label = "gb-pc2:green:lan1"; + label = "green:lan1"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; lan2 { - label = "gb-pc2:green:lan2"; + label = "green:lan2"; gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; lan3-yellow { - label = "gb-pc2:yellow:lan3"; + label = "yellow:lan3"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; lan3-green { - label = "gb-pc2:green:lan3"; + label = "green:lan3"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts index 5bb6544d12..87b103f539 100644 --- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts +++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_status: status { - label = "hc5962:white:status"; + label = "white:status"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_system: system { - label = "hc5962:red:system"; + label = "red:system"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; panic-indicator; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts index 546abd023a..879fb68c85 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_power: power { - label = "wn-ax1167gr:green:power"; + label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; wps { - label = "wn-ax1167gr:green:wps"; + label = "green:wps"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts index 0a18518de6..06d024e9a7 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_power: power { - label = "wn-gx300gr:green:power"; + label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; wps { - label = "wn-gx300gr:green:wps"; + label = "green:wps"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi index 1ed9380b37..ff9e525ae2 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi +++ b/target/linux/ramips/dts/mt7621_iodata_wn-xx-xr.dtsi @@ -18,12 +18,12 @@ compatible = "gpio-leds"; wps { - label = "iodata:green:wps"; + label = "green:wps"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "iodata:green:power"; + label = "green:power"; gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts index 827e606b52..0e808f6894 100644 --- a/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts +++ b/target/linux/ramips/dts/mt7621_iodata_wnpr2600g.dts @@ -20,24 +20,24 @@ compatible = "gpio-leds"; led_power: power { - label = "wnpr2600g:green:power"; + label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; default-state = "on"; }; notification { - label = "wnpr2600g:green:notification"; + label = "green:notification"; gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "wnpr2600g:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0radio"; }; wlan5g { - label = "wnpr2600g:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1radio"; }; diff --git a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts index 9e7cbf39be..4ebd980521 100644 --- a/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts +++ b/target/linux/ramips/dts/mt7621_iptime_a6ns-m.dts @@ -21,26 +21,26 @@ compatible = "gpio-leds"; usb { - label = "a6ns-m:blue:usb"; + label = "blue:usb"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; }; wlan5g { - label = "a6ns-m:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan2g { - label = "a6ns-m:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1radio"; }; led_cpu: cpu { - label = "a6ns-m:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts index cccc317cc3..df6aed664e 100644 --- a/target/linux/ramips/dts/mt7621_iptime_a8004t.dts +++ b/target/linux/ramips/dts/mt7621_iptime_a8004t.dts @@ -20,18 +20,18 @@ compatible = "gpio-leds"; led_cpu: cpu { - label = "a8004t:orange:cpu"; + label = "orange:cpu"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "a8004t:orange:wlan2g"; + label = "orange:wlan2g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0radio"; }; wlan5g { - label = "a8004t:orange:wlan5g"; + label = "orange:wlan5g"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1radio"; }; diff --git a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts index 0427ae1df6..ae312fcc52 100644 --- a/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts +++ b/target/linux/ramips/dts/mt7621_jcg_jhr-ac876m.dts @@ -21,21 +21,21 @@ compatible = "gpio-leds"; usb3 { - label = "jhr-ac876m:blue:usb3"; + label = "blue:usb3"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; }; usb2 { - label = "jhr-ac876m:blue:usb2"; + label = "blue:usb2"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port2>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "jhr-ac876m:blue:wps"; + label = "blue:wps"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts index d76014d104..fa26900720 100644 --- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts +++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts @@ -23,17 +23,17 @@ compatible = "gpio-leds"; status-red { - label = "newifi-d1:red:status"; + label = "red:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; status-green { - label = "newifi-d1:green:status"; + label = "green:status"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_blue: status-blue { - label = "newifi-d1:blue:status"; + label = "blue:status"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; default-state = "on"; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_ea7300-v1.dts b/target/linux/ramips/dts/mt7621_linksys_ea7300-v1.dts index 9636559e09..3e50d85e9c 100644 --- a/target/linux/ramips/dts/mt7621_linksys_ea7300-v1.dts +++ b/target/linux/ramips/dts/mt7621_linksys_ea7300-v1.dts @@ -5,50 +5,4 @@ / { compatible = "linksys,ea7300-v1", "mediatek,mt7621-soc"; model = "Linksys EA7300 v1"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wan_green { - label = "ea7300-v1:green:wan"; - gpios = <&gpio 7 GPIO_ACTIVE_LOW>; - }; - - lan1_green { - label = "ea7300-v1:green:lan1"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - lan2_green { - label = "ea7300-v1:green:lan2"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - }; - - lan3_green { - label = "ea7300-v1:green:lan3"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - lan4_green { - label = "ea7300-v1:green:lan4"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "ea7300-v1:white:power"; - gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; - }; - - wps { - label = "ea7300-v1:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_ea7300-v2.dts b/target/linux/ramips/dts/mt7621_linksys_ea7300-v2.dts index 359ad17f86..4ee148828a 100644 --- a/target/linux/ramips/dts/mt7621_linksys_ea7300-v2.dts +++ b/target/linux/ramips/dts/mt7621_linksys_ea7300-v2.dts @@ -5,50 +5,4 @@ / { compatible = "linksys,ea7300-v2", "mediatek,mt7621-soc"; model = "Linksys EA7300 v2"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wan_green { - label = "ea7300-v2:green:wan"; - gpios = <&gpio 7 GPIO_ACTIVE_LOW>; - }; - - lan1_green { - label = "ea7300-v2:green:lan1"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - lan2_green { - label = "ea7300-v2:green:lan2"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - }; - - lan3_green { - label = "ea7300-v2:green:lan3"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - lan4_green { - label = "ea7300-v2:green:lan4"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "ea7300-v2:white:power"; - gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; - }; - - wps { - label = "ea7300-v2:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_ea7500-v2.dts b/target/linux/ramips/dts/mt7621_linksys_ea7500-v2.dts index 7f611b9815..8e13cc26ad 100644 --- a/target/linux/ramips/dts/mt7621_linksys_ea7500-v2.dts +++ b/target/linux/ramips/dts/mt7621_linksys_ea7500-v2.dts @@ -5,50 +5,4 @@ / { compatible = "linksys,ea7500-v2", "mediatek,mt7621-soc"; model = "Linksys EA7500 v2"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wan_green { - label = "ea7500-v2:green:wan"; - gpios = <&gpio 7 GPIO_ACTIVE_LOW>; - }; - - lan1_green { - label = "ea7500-v2:green:lan1"; - gpios = <&gpio 3 GPIO_ACTIVE_LOW>; - }; - - lan2_green { - label = "ea7500-v2:green:lan2"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - }; - - lan3_green { - label = "ea7500-v2:green:lan3"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - lan4_green { - label = "ea7500-v2:green:lan4"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "ea7500-v2:white:power"; - gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; - }; - - wps { - label = "ea7500-v2:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7621_linksys_ea7xxx.dtsi b/target/linux/ramips/dts/mt7621_linksys_ea7xxx.dtsi index 46b1c9cdfc..ecff6406d5 100644 --- a/target/linux/ramips/dts/mt7621_linksys_ea7xxx.dtsi +++ b/target/linux/ramips/dts/mt7621_linksys_ea7xxx.dtsi @@ -6,6 +6,13 @@ #include / { + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + chosen { bootargs = "console=ttyS0,115200"; }; @@ -25,6 +32,45 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + wan_green { + label = "green:wan"; + gpios = <&gpio 7 GPIO_ACTIVE_LOW>; + }; + + lan1_green { + label = "green:lan1"; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; + }; + + lan2_green { + label = "green:lan2"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + }; + + lan3_green { + label = "green:lan3"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + lan4_green { + label = "green:lan4"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + led_power: power { + label = "white:power"; + gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; + }; + + wps { + label = "green:wps"; + gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + }; + }; }; &nand { diff --git a/target/linux/ramips/dts/mt7621_linksys_re6500.dts b/target/linux/ramips/dts/mt7621_linksys_re6500.dts index 6313e85adf..319d0d7fb2 100644 --- a/target/linux/ramips/dts/mt7621_linksys_re6500.dts +++ b/target/linux/ramips/dts/mt7621_linksys_re6500.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; wifi { - label = "re6500:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; led_power: power { - label = "re6500:white:power"; + label = "white:power"; gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts index a4d16dc131..7f329b2359 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts @@ -17,13 +17,13 @@ compatible = "gpio-leds"; pwr { - label = "routerboard-750gr3:blue:pwr"; + label = "blue:pwr"; gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; default-state = "on"; }; led_usr: usr { - label = "routerboard-750gr3:green:usr"; + label = "green:usr"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-760igs.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-760igs.dts index ca1b3cc421..ed0b4e52cf 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-760igs.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-760igs.dts @@ -17,13 +17,13 @@ compatible = "gpio-leds"; led_pwr: pwr { - label = "routerboard-760igs:blue:pwr"; + label = "blue:pwr"; gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; default-state = "on"; }; sfp { - label = "routerboard-760igs:blue:sfp"; + label = "blue:sfp"; gpios = <&gpio 9 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts index 1180c8a979..20a834a3eb 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts @@ -15,32 +15,32 @@ compatible = "gpio-leds"; led_usr: usr { - label = "routerboard-m11g:green:usr"; + label = "green:usr"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; rssi0 { - label = "routerboard-m11g:green:rssi0"; + label = "green:rssi0"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; rssi1 { - label = "routerboard-m11g:green:rssi1"; + label = "green:rssi1"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; rssi2 { - label = "routerboard-m11g:green:rssi2"; + label = "green:rssi2"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; rssi3 { - label = "routerboard-m11g:green:rssi3"; + label = "green:rssi3"; gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; rssi4 { - label = "routerboard-m11g:green:rssi4"; + label = "green:rssi4"; gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts index 5597dc812e..affbaf35b7 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts @@ -15,7 +15,7 @@ compatible = "gpio-leds"; led_usr: usr { - label = "routerboard-m33g:green:usr"; + label = "green:usr"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts index de6a9b7f36..8a79d9ca9a 100644 --- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts +++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts @@ -19,24 +19,24 @@ compatible = "gpio-leds"; led_power: power { - label = "wr1201:green:power"; + label = "green:power"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; usb { - label = "wr1201:green:usb"; + label = "green:usb"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; eth_link { - label = "wr1201:green:eth_link"; + label = "green:eth_link"; gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; wps { - label = "wr1201:green:wps"; + label = "green:wps"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts index 9a59dab98d..8fce1d7d6d 100644 --- a/target/linux/ramips/dts/mt7621_netgear_ex6150.dts +++ b/target/linux/ramips/dts/mt7621_netgear_ex6150.dts @@ -20,49 +20,49 @@ compatible = "gpio-leds"; power_amber: power_amber { - label = "ex6150:amber:power"; + label = "amber:power"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; power_green: power_green { - label = "ex6150:green:power"; + label = "green:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; wps { - label = "ex6150:green:wps"; + label = "green:wps"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; rightarrow { - label = "ex6150:blue:rightarrow"; + label = "blue:rightarrow"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; leftarrow { - label = "ex6150:blue:leftarrow"; + label = "blue:leftarrow"; gpios = <&gpio 31 GPIO_ACTIVE_LOW>; }; router_green { - label = "ex6150:green:router"; + label = "green:router"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; router_red { - label = "ex6150:red:router"; + label = "red:router"; gpios = <&gpio 30 GPIO_ACTIVE_LOW>; }; client_green { - label = "ex6150:green:client"; + label = "green:client"; gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; client_red { - label = "ex6150:red:client"; + label = "red:client"; gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6220.dts b/target/linux/ramips/dts/mt7621_netgear_r6220.dts index 644972d15f..cc29d4ea8e 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6220.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6220.dts @@ -7,26 +7,6 @@ model = "Netgear R6220"; }; -&led_power { - label = "r6220:green:power"; -}; - -&led_usb { - label = "r6220:green:usb"; -}; - -&led_internet { - label = "r6220:green:wan"; -}; - -&led_wifi { - label = "r6220:green:wifi"; -}; - -&led_wps { - label = "r6220:green:wps"; -}; - &nand { status = "okay"; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6260.dts b/target/linux/ramips/dts/mt7621_netgear_r6260.dts index ad655eb83c..b32f26d890 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6260.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6260.dts @@ -6,19 +6,3 @@ compatible = "netgear,r6260", "mediatek,mt7621-soc"; model = "Netgear R6260"; }; - -&led_power { - label = "r6260:green:power"; -}; - -&led_usb { - label = "r6260:green:usb"; -}; - -&led_internet { - label = "r6260:green:wan"; -}; - -&led_wifi { - label = "r6260:green:wifi"; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6350.dts b/target/linux/ramips/dts/mt7621_netgear_r6350.dts index c43dbf1c89..22535c9ae6 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6350.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6350.dts @@ -6,19 +6,3 @@ compatible = "netgear,r6350", "mediatek,mt7621-soc"; model = "Netgear R6350"; }; - -&led_power { - label = "r6350:green:power"; -}; - -&led_usb { - label = "r6350:green:usb"; -}; - -&led_internet { - label = "r6350:green:wan"; -}; - -&led_wifi { - label = "r6350:green:wifi"; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts index af9a0ee2ce..b93d6aa5a7 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6700-v2.dts @@ -5,116 +5,11 @@ / { compatible = "netgear,r6700-v2", "mediatek,mt7621-soc"; model = "Netgear R6700 v2"; - - aliases { - led-boot = &led_power_white; - led-failsafe = &led_power_orange; - led-running = &led_power_white; - led-upgrade = &led_power_orange; - }; - - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - gpios = <&gpio_expander 0 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:power"; - }; - - led_power_white: power_white { - gpios = <&gpio_expander 1 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:power"; - }; - - wan_orange { - gpios = <&gpio_expander 2 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:wan"; - }; - - wan_white { - gpios = <&gpio_expander 3 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:wan"; - }; - - wlan2g { - gpios = <&gpio_expander 4 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:wlan2g"; - linux,default-trigger = "phy0radio"; - }; - - wlan5g { - gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:wlan5g"; - linux,default-trigger = "phy1radio"; - }; - - guest_wifi { - gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:guest_wifi"; - }; - - usb3 { - gpios = <&gpio_expander 7 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:usb3"; - linux,default-trigger = "usbport"; - trigger-sources = <&xhci_ehci_port1>; - }; - - lan1_orange { - gpios = <&gpio_expander 8 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:lan1"; - }; - - lan1_white { - gpios = <&gpio_expander 9 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:lan1"; - }; - - lan2_orange { - gpios = <&gpio_expander 10 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:lan2"; - }; - - lan2_white { - gpios = <&gpio_expander 11 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:lan2"; - }; - - lan3_orange { - gpios = <&gpio_expander 12 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:lan3"; - }; - - lan3_white { - gpios = <&gpio_expander 13 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:lan3"; - }; - - lan4_orange { - gpios = <&gpio_expander 14 GPIO_ACTIVE_LOW>; - label = "r6700-v2:orange:lan4"; - }; - - lan4_white { - gpios = <&gpio_expander 15 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:lan4"; - }; - - wps { - gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; - label = "r6700-v2:white:wps"; - }; - - wlan { - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; - label = "r6700-v2:white:wlan"; - }; - }; }; -&state_default { - gpio { - groups = "uart3", "uart2", "jtag", "wdt"; - function = "gpio"; +&leds { + guest_wifi { + gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>; + label = "white:guest_wifi"; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6800.dts b/target/linux/ramips/dts/mt7621_netgear_r6800.dts index 9b6de32b50..c7afc53016 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6800.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6800.dts @@ -5,118 +5,13 @@ / { compatible = "netgear,r6800", "mediatek,mt7621-soc"; model = "Netgear R6800"; - - aliases { - led-boot = &led_power_white; - led-failsafe = &led_power_orange; - led-running = &led_power_white; - led-upgrade = &led_power_orange; - }; - - leds { - compatible = "gpio-leds"; - - led_power_orange: power_orange { - gpios = <&gpio_expander 0 GPIO_ACTIVE_LOW>; - label = "r6800:orange:power"; - }; - - led_power_white: power_white { - gpios = <&gpio_expander 1 GPIO_ACTIVE_LOW>; - label = "r6800:white:power"; - }; - - wan_orange { - gpios = <&gpio_expander 2 GPIO_ACTIVE_LOW>; - label = "r6800:orange:wan"; - }; - - wan_white { - gpios = <&gpio_expander 3 GPIO_ACTIVE_LOW>; - label = "r6800:white:wan"; - }; - - wlan2g { - gpios = <&gpio_expander 4 GPIO_ACTIVE_LOW>; - label = "r6800:white:wlan2g"; - linux,default-trigger = "phy0radio"; - }; - - wlan5g { - gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>; - label = "r6800:white:wlan5g"; - linux,default-trigger = "phy1radio"; - }; - - usb2 { - gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>; - label = "r6800:white:usb2"; - linux,default-trigger = "usbport"; - trigger-sources = <&ehci_port2>; - }; - - usb3 { - gpios = <&gpio_expander 7 GPIO_ACTIVE_LOW>; - label = "r6800:white:usb3"; - linux,default-trigger = "usbport"; - trigger-sources = <&xhci_ehci_port1>; - }; - - lan1_orange { - gpios = <&gpio_expander 8 GPIO_ACTIVE_LOW>; - label = "r6800:orange:lan1"; - }; - - lan1_white { - gpios = <&gpio_expander 9 GPIO_ACTIVE_LOW>; - label = "r6800:white:lan1"; - }; - - lan2_orange { - gpios = <&gpio_expander 10 GPIO_ACTIVE_LOW>; - label = "r6800:orange:lan2"; - }; - - lan2_white { - gpios = <&gpio_expander 11 GPIO_ACTIVE_LOW>; - label = "r6800:white:lan2"; - }; - - lan3_orange { - gpios = <&gpio_expander 12 GPIO_ACTIVE_LOW>; - label = "r6800:orange:lan3"; - }; - - lan3_white { - gpios = <&gpio_expander 13 GPIO_ACTIVE_LOW>; - label = "r6800:white:lan3"; - }; - - lan4_orange { - gpios = <&gpio_expander 14 GPIO_ACTIVE_LOW>; - label = "r6800:orange:lan4"; - }; - - lan4_white { - gpios = <&gpio_expander 15 GPIO_ACTIVE_LOW>; - label = "r6800:white:lan4"; - }; - - wps { - gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; - label = "r6800:white:wps"; - }; - - wlan { - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; - label = "r6800:white:wlan"; - }; - }; }; -&state_default { - gpio { - groups = "uart3", "uart2", "jtag", "wdt"; - function = "gpio"; +&leds { + usb2 { + gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>; + label = "white:usb2"; + linux,default-trigger = "usbport"; + trigger-sources = <&ehci_port2>; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_r6850.dts b/target/linux/ramips/dts/mt7621_netgear_r6850.dts index 19eb67d2d0..78e9093216 100644 --- a/target/linux/ramips/dts/mt7621_netgear_r6850.dts +++ b/target/linux/ramips/dts/mt7621_netgear_r6850.dts @@ -6,19 +6,3 @@ compatible = "netgear,r6850", "mediatek,mt7621-soc"; model = "Netgear R6850"; }; - -&led_power { - label = "r6850:green:power"; -}; - -&led_usb { - label = "r6850:green:usb"; -}; - -&led_internet { - label = "r6850:green:wan"; -}; - -&led_wifi { - label = "r6850:green:wifi"; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi index 0ec1a4fb3c..1a19cd048b 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi @@ -42,25 +42,30 @@ compatible = "gpio-leds"; led_power: power { + label = "green:power"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; - led_usb: usb { + usb { + label = "green:usb"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; - led_internet: internet { + internet { + label = "green:wan"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - led_wifi: wifi { + wifi { + label = "green:wifi"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; - led_wps: wps { + wps { + label = "green:wps"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi index eefda07860..71c95e75bd 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi @@ -10,6 +10,10 @@ aliases { label-mac-device = &gmac0; + led-boot = &led_power_white; + led-failsafe = &led_power_orange; + led-running = &led_power_white; + led-upgrade = &led_power_orange; }; keys { @@ -33,6 +37,106 @@ linux,code = ; }; }; + + leds: leds { + compatible = "gpio-leds"; + + led_power_orange: power_orange { + gpios = <&gpio_expander 0 GPIO_ACTIVE_LOW>; + label = "orange:power"; + }; + + led_power_white: power_white { + gpios = <&gpio_expander 1 GPIO_ACTIVE_LOW>; + label = "white:power"; + }; + + wan_orange { + gpios = <&gpio_expander 2 GPIO_ACTIVE_LOW>; + label = "orange:wan"; + }; + + wan_white { + gpios = <&gpio_expander 3 GPIO_ACTIVE_LOW>; + label = "white:wan"; + }; + + wlan2g { + gpios = <&gpio_expander 4 GPIO_ACTIVE_LOW>; + label = "white:wlan2g"; + linux,default-trigger = "phy0radio"; + }; + + wlan5g { + gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>; + label = "white:wlan5g"; + linux,default-trigger = "phy1radio"; + }; + + usb3 { + gpios = <&gpio_expander 7 GPIO_ACTIVE_LOW>; + label = "white:usb3"; + linux,default-trigger = "usbport"; + trigger-sources = <&xhci_ehci_port1>; + }; + + lan1_orange { + gpios = <&gpio_expander 8 GPIO_ACTIVE_LOW>; + label = "orange:lan1"; + }; + + lan1_white { + gpios = <&gpio_expander 9 GPIO_ACTIVE_LOW>; + label = "white:lan1"; + }; + + lan2_orange { + gpios = <&gpio_expander 10 GPIO_ACTIVE_LOW>; + label = "orange:lan2"; + }; + + lan2_white { + gpios = <&gpio_expander 11 GPIO_ACTIVE_LOW>; + label = "white:lan2"; + }; + + lan3_orange { + gpios = <&gpio_expander 12 GPIO_ACTIVE_LOW>; + label = "orange:lan3"; + }; + + lan3_white { + gpios = <&gpio_expander 13 GPIO_ACTIVE_LOW>; + label = "white:lan3"; + }; + + lan4_orange { + gpios = <&gpio_expander 14 GPIO_ACTIVE_LOW>; + label = "orange:lan4"; + }; + + lan4_white { + gpios = <&gpio_expander 15 GPIO_ACTIVE_LOW>; + label = "white:lan4"; + }; + + wps { + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; + label = "white:wps"; + }; + + wlan { + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; + label = "white:wlan"; + }; + }; +}; + +&state_default { + gpio { + groups = "uart3", "uart2", "jtag", "wdt"; + function = "gpio"; + }; }; &pcie { diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index dc15d5f91f..7a15cd1f6c 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -20,20 +20,24 @@ compatible = "gpio-leds"; led_power: power { + label = "green:power"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; - led_usb: usb { + usb { + label = "green:usb"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; - led_internet: internet { + internet { + label = "green:wan"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - led_wifi: wifi { + wifi { + label = "green:wifi"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_wac104.dts b/target/linux/ramips/dts/mt7621_netgear_wac104.dts index b811d80722..fbedeb2645 100644 --- a/target/linux/ramips/dts/mt7621_netgear_wac104.dts +++ b/target/linux/ramips/dts/mt7621_netgear_wac104.dts @@ -43,17 +43,17 @@ compatible = "gpio-leds"; wps { - label = "wac104:green:wps"; + label = "green:wps"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wac104:green:power"; + label = "green:power"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; wifi { - label = "wac104:green:wifi"; + label = "green:wifi"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7621_netgear_wac124.dts b/target/linux/ramips/dts/mt7621_netgear_wac124.dts index bd23d209b7..92860c00af 100644 --- a/target/linux/ramips/dts/mt7621_netgear_wac124.dts +++ b/target/linux/ramips/dts/mt7621_netgear_wac124.dts @@ -6,19 +6,3 @@ compatible = "netgear,wac124", "mediatek,mt7621-soc"; model = "Netgear WAC124"; }; - -&led_power { - label = "wac124:green:power"; -}; - -&led_usb { - label = "wac124:green:usb"; -}; - -&led_internet { - label = "wac124:green:wan"; -}; - -&led_wifi { - label = "wac124:green:wifi"; -}; diff --git a/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts b/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts index 7e070b7829..90c0ca1276 100644 --- a/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts +++ b/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts @@ -7,26 +7,6 @@ model = "Netgear WNDR3700 v5"; }; -&led_power { - label = "wndr3700-v5:green:power"; -}; - -&led_usb { - label = "wndr3700-v5:green:usb"; -}; - -&led_internet { - label = "wndr3700-v5:green:wan"; -}; - -&led_wifi { - label = "wndr3700-v5:green:wifi"; -}; - -&led_wps { - label = "wndr3700-v5:green:wps"; -}; - &spi0 { status = "okay"; diff --git a/target/linux/ramips/dts/mt7621_netis_wf2881.dts b/target/linux/ramips/dts/mt7621_netis_wf2881.dts index e40fb312ee..7dfd133a44 100644 --- a/target/linux/ramips/dts/mt7621_netis_wf2881.dts +++ b/target/linux/ramips/dts/mt7621_netis_wf2881.dts @@ -19,14 +19,14 @@ compatible = "gpio-leds"; usb { - label = "wf2881:green:usb"; + label = "green:usb"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "wf2881:green:wps"; + label = "green:wps"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts index 9825118b08..83169cd1e9 100644 --- a/target/linux/ramips/dts/mt7621_phicomm_k2p.dts +++ b/target/linux/ramips/dts/mt7621_phicomm_k2p.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; stat_r { - label = "k2p:red:status"; + label = "red:status"; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; stat_y { - label = "k2p:yellow:status"; + label = "yellow:status"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; led_blue: stat_b { - label = "k2p:blue:status"; + label = "blue:status"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_planex_vr500.dts b/target/linux/ramips/dts/mt7621_planex_vr500.dts index c6b9e3a2b4..5f8f190a91 100644 --- a/target/linux/ramips/dts/mt7621_planex_vr500.dts +++ b/target/linux/ramips/dts/mt7621_planex_vr500.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "vr500:green:power"; + label = "green:power"; gpios = <&gpio 45 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts index f619d77cac..9561c97b7e 100644 --- a/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts +++ b/target/linux/ramips/dts/mt7621_samknows_whitebox-v8.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_wps: wps { - label = "sk-wb8:green:wps"; + label = "green:wps"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; usb { - label = "sk-wb8:green:usb"; + label = "green:usb"; gpios = <&gpio 47 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts index e40d999412..d44960a9a1 100644 --- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts +++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts @@ -11,7 +11,7 @@ compatible = "gpio-leds"; usb { - label = "sap-g3200u3:green:usb"; + label = "green:usb"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts index 29aeb85b19..fc9b4c6d2a 100644 --- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts +++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts @@ -34,47 +34,47 @@ compatible = "gpio-leds"; system_led: system { - label = "x1:green:system"; + label = "green:system"; gpios = <&gpio 26 GPIO_ACTIVE_LOW>; }; modem_offline { - label = "x1:red:modem-offline"; + label = "red:modem-offline"; gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; }; modem_4g { - label = "x1:blue:modem-4g"; + label = "blue:modem-4g"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; modem_3g { - label = "x1:green:modem-3g"; + label = "green:modem-3g"; gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; modem_rssi_lowest { - label = "x1:green:modem-rssi-lowest"; + label = "green:modem-rssi-lowest"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; }; modem_rssi_low { - label = "x1:green:modem-rssi-low"; + label = "green:modem-rssi-low"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; modem_rssi_medium { - label = "x1:green:modem-rssi-medium"; + label = "green:modem-rssi-medium"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; modem_rssi_high { - label = "x1:green:modem-rssi-high"; + label = "green:modem-rssi-high"; gpios = <&gpio 30 GPIO_ACTIVE_LOW>; }; modem_rssi_highest { - label = "x1:green:modem-rssi-highest"; + label = "green:modem-rssi-highest"; gpios = <&gpio 31 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts index f40c0eb7c2..fe11f4f487 100644 --- a/target/linux/ramips/dts/mt7621_thunder_timecloud.dts +++ b/target/linux/ramips/dts/mt7621_thunder_timecloud.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; statw { - label = "timecloud:white:status"; + label = "white:status"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_statuso: stato { - label = "timecloud:orange:status"; + label = "orange:status"; gpios = <&gpio 8 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts index f217cdf662..d0e38f1721 100644 --- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts +++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts @@ -20,7 +20,7 @@ compatible = "gpio-leds"; led_sys: sys { - label = "a7000r:blue:sys"; + label = "blue:sys"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts index 5e5539e489..9f29ecd8cf 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts @@ -18,37 +18,37 @@ compatible = "gpio-leds"; led_power: power { - label = "re350-v1:blue:power"; + label = "blue:power"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; wifi2g { - label = "re350-v1:blue:wifi2G"; + label = "blue:wifi2G"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; }; wifi5g { - label = "re350-v1:blue:wifi5G"; + label = "blue:wifi5G"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; wps_r { - label = "re350-v1:red:wps"; + label = "red:wps"; gpios = <&gpio 25 GPIO_ACTIVE_HIGH>; }; wps_b { - label = "re350-v1:blue:wps"; + label = "blue:wps"; gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; }; eth { - label = "re350-v1:green:eth_act"; + label = "green:eth_act"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; }; eth2 { - label = "re350-v1:green:eth_link"; + label = "green:eth_link"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re500-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re500-v1.dts index e164f9ba2a..f199423ed0 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re500-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re500-v1.dts @@ -5,59 +5,4 @@ / { compatible = "tplink,re500-v1", "mediatek,mt7621-soc"; model = "TP-Link RE500 v1"; - - 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 = "re500-v1:blue:power"; - gpios = <&gpio 22 GPIO_ACTIVE_LOW>; - }; - - wifi2g { - label = "re500-v1:blue:wifi2g"; - gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wifi5g { - label = "re500-v1:blue:wifi5g"; - gpios = <&gpio 24 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - wps_red { - label = "re500-v1:red:wps"; - gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; - }; - - wps_blue { - label = "re500-v1:blue:wps"; - gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; - }; - - eth_act { - label = "re500-v1:green:eth_act"; - gpios = <&gpio 28 GPIO_ACTIVE_LOW>; - }; - - eth_link { - label = "re500-v1:green:eth_link"; - gpios = <&gpio 29 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&state_default { - gpio { - groups = "rgmii2", "wdt"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts index 4e0d16c0c6..dcc5a3b3e9 100644 --- a/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts +++ b/target/linux/ramips/dts/mt7621_tplink_re650-v1.dts @@ -5,59 +5,4 @@ / { compatible = "tplink,re650-v1", "mediatek,mt7621-soc"; model = "TP-Link RE650 v1"; - - 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 = "re650-v1:blue:power"; - gpios = <&gpio 22 GPIO_ACTIVE_LOW>; - }; - - wifi2g { - label = "re650-v1:blue:wifi2g"; - gpios = <&gpio 23 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wifi5g { - label = "re650-v1:blue:wifi5g"; - gpios = <&gpio 24 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - wps_red { - label = "re650-v1:red:wps"; - gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; - }; - - wps_blue { - label = "re650-v1:blue:wps"; - gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; - }; - - eth_act { - label = "re650-v1:green:eth_act"; - gpios = <&gpio 28 GPIO_ACTIVE_LOW>; - }; - - eth_link { - label = "re650-v1:green:eth_link"; - gpios = <&gpio 29 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&state_default { - gpio { - groups = "rgmii2", "wdt"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi b/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi index 7e860cb00e..45a983098d 100644 --- a/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi +++ b/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi @@ -8,6 +8,10 @@ / { aliases { label-mac-device = &gmac0; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; keys { @@ -41,6 +45,47 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "blue:power"; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + }; + + wifi2g { + label = "blue:wifi2g"; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wifi5g { + label = "blue:wifi5g"; + gpios = <&gpio 24 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + wps_red { + label = "red:wps"; + gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; + }; + + wps_blue { + label = "blue:wps"; + gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; + }; + + eth_act { + label = "green:eth_act"; + gpios = <&gpio 28 GPIO_ACTIVE_LOW>; + }; + + eth_link { + label = "green:eth_link"; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; + }; + }; }; &spi0 { @@ -87,6 +132,13 @@ }; }; +&state_default { + gpio { + groups = "rgmii2", "wdt"; + function = "gpio"; + }; +}; + &pcie { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts index 71638032f2..4ba5f6a428 100644 --- a/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts +++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-nanohd.dts @@ -25,12 +25,12 @@ compatible = "gpio-leds"; led_blue: dome_blue { - label = "nanohd:blue:dome"; + label = "blue:dome"; gpios = <&gpio 3 GPIO_ACTIVE_HIGH>; }; led_white: dome_white { - label = "nanohd:white:dome"; + label = "white:dome"; gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi index ca0e2d7dcd..ae8f3a5e54 100644 --- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi +++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi @@ -76,17 +76,17 @@ compatible = "gpio-leds"; led_status: status { - label = "u7621-06:green:status"; + label = "green:status"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; led4 { - label = "u7621-06:green:led4"; + label = "green:led4"; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; led5 { - label = "u7621-06:green:led5"; + label = "green:led5"; gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts b/target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts index 1dcea5f285..04f656d0f6 100644 --- a/target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts +++ b/target/linux/ramips/dts/mt7621_wavlink_wl-wn531a6.dts @@ -48,17 +48,17 @@ compatible = "gpio-leds"; led_status_blue: status_blue { - label = "wl-wn531a6:blue:power"; + label = "blue:power"; gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; }; led_status_red: status_red { - label = "wl-wn531a6:red:power"; + label = "red:power"; gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; }; wifi2g { - label = "wl-wn531a6:blue:wifi2g"; + label = "blue:wifi2g"; gpios = <&gpio 23 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts index 66f8b9df0f..60d31852f0 100644 --- a/target/linux/ramips/dts/mt7621_wevo_11acnas.dts +++ b/target/linux/ramips/dts/mt7621_wevo_11acnas.dts @@ -8,7 +8,7 @@ compatible = "gpio-leds"; usb { - label = "11acnas:green:usb"; + label = "green:usb"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts index 5ee466ba6b..bd449832e3 100644 --- a/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts +++ b/target/linux/ramips/dts/mt7621_wevo_w2914ns-v2.dts @@ -8,7 +8,7 @@ compatible = "gpio-leds"; usb { - label = "w2914nsv2:green:usb"; + label = "green:usb"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts b/target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts index 8e6d116f48..803bf5cf24 100644 --- a/target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts +++ b/target/linux/ramips/dts/mt7621_winstars_ws-wn583a6.dts @@ -20,22 +20,22 @@ compatible = "gpio-leds"; night_light_white { - label = "ws-wn583a6:white:night_light"; + label = "white:night_light"; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; led_status_blue: status_blue { - label = "ws-wn583a6:blue:status"; + label = "blue:status"; gpios = <&gpio 22 GPIO_ACTIVE_LOW>; }; status_amber { - label = "ws-wn583a6:amber:status"; + label = "amber:status"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; led_status_red: status_red { - label = "ws-wn583a6:red:status"; + label = "red:status"; gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts index fd9c842ece..6cca16a79b 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-ac2100.dts @@ -18,22 +18,22 @@ compatible = "gpio-leds"; wan_yellow { - label = "mi-router-ac2100:yellow:wan"; + label = "yellow:wan"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; wan_blue { - label = "mi-router-ac2100:blue:wan"; + label = "blue:wan"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { - label = "mi-router-ac2100:yellow:status"; + label = "yellow:status"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { - label = "mi-router-ac2100:blue:status"; + label = "blue:status"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts index 37f34a947e..3df6931bd4 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts @@ -25,12 +25,12 @@ compatible = "gpio-leds"; led_status_blue: status_blue { - label = "mir3gv2:blue:status"; + label = "blue:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { - label = "mir3gv2:yellow:status"; + label = "yellow:status"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts index 1c3ff7de73..51f4842255 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts @@ -23,34 +23,34 @@ compatible = "gpio-leds"; led_status_red: status_red { - label = "mir3g:red:status"; + label = "red:status"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { - label = "mir3g:blue:status"; + label = "blue:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { - label = "mir3g:yellow:status"; + label = "yellow:status"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; wan_amber { - label = "mir3g:amber:wan"; + label = "amber:wan"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:01:1Gbps"; }; lan1_amber { - label = "mir3g:amber:lan1"; + label = "amber:lan1"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:03:1Gbps"; }; lan2_amber { - label = "mir3g:amber:lan2"; + label = "amber:lan2"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:02:1Gbps"; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts index 6fe857e451..43e61e9140 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts @@ -25,40 +25,40 @@ compatible = "gpio-leds"; led_status_red: status_red { - label = "mir3p:red:status"; + label = "red:status"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status_blue: status_blue { - label = "mir3p:blue:status"; + label = "blue:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_status_yellow: status_yellow { - label = "mir3p:yellow:status"; + label = "yellow:status"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; wan_amber { - label = "mir3p:amber:wan"; + label = "amber:wan"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:04:1Gbps"; }; lan3_amber { - label = "mir3p:amber:lan3"; + label = "amber:lan3"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:01:1Gbps"; }; lan2_amber { - label = "mir3p:amber:lan2"; + label = "amber:lan2"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:02:1Gbps"; }; lan1_amber { - label = "mir3p:amber:lan1"; + label = "amber:lan1"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; linux,default-trigger = "dsa-0.0:03:1Gbps"; }; diff --git a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts index 54c8a672e4..4299de318b 100644 --- a/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts +++ b/target/linux/ramips/dts/mt7621_xiaomi_redmi-router-ac2100.dts @@ -18,22 +18,22 @@ compatible = "gpio-leds"; led_status_amber: status_amber { - label = "redmi-router-ac2100:amber:status"; + label = "amber:status"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_status_white: status_white { - label = "redmi-router-ac2100:white:status"; + label = "white:status"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; wan_amber { - label = "redmi-router-ac2100:amber:wan"; + label = "amber:wan"; gpios = <&gpio 10 GPIO_ACTIVE_LOW>; }; wan_white { - label = "redmi-router-ac2100:white:wan"; + label = "white:wan"; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts index e7f9161b46..b90ff92c70 100644 --- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts +++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts @@ -19,12 +19,12 @@ compatible = "gpio-leds"; work { - label = "xy-c5:green:work"; + label = "green:work"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; }; led_sys: sys { - label = "xy-c5:green:sys"; + label = "green:sys"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts index 2179de0a5e..182b6db5b3 100644 --- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts +++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts @@ -24,29 +24,29 @@ compatible = "gpio-leds"; power { - label = "creativebox-v1:blue:power"; + label = "blue:power"; gpios = <&gpio 31 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_sys: sys { - label = "creativebox-v1:blue:sys"; + label = "blue:sys"; gpios = <&gpio 32 GPIO_ACTIVE_LOW>; }; internet { - label = "creativebox-v1:blue:internet"; + label = "blue:internet"; gpios = <&gpio 29 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "creativebox-v1:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "creativebox-v1:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 28 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts index 31a9dc9b91..a77d13c71c 100644 --- a/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts +++ b/target/linux/ramips/dts/mt7621_youhua_wr1200js.dts @@ -20,17 +20,17 @@ compatible = "gpio-leds"; internet { - label = "wr1200js:blue:internet"; + label = "blue:internet"; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "wr1200js:blue:wps"; + label = "blue:wps"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; }; usb { - label = "wr1200js:blue:usb"; + label = "blue:usb"; gpios = <&gpio 8 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts index 87ee9b8fa1..fd4395985c 100644 --- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts +++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts @@ -24,18 +24,18 @@ compatible = "gpio-leds"; led_power: power { - label = "yk-l2:blue:power"; + label = "blue:power"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_wps: wps { - label = "yk-l2:blue:wps"; + label = "blue:wps"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; usb { - label = "yk-l2:blue:usb"; + label = "blue:usb"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts index 32acfe169f..d0d656ba6d 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts @@ -32,7 +32,7 @@ compatible = "gpio-leds"; led_status: status { - label = "zbt-wg2626:green:status"; + label = "green:status"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi index fe1d660060..515d37ceaa 100644 --- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi +++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi @@ -32,7 +32,7 @@ compatible = "gpio-leds"; led_status: status { - label = "zbt-wg3526:green:status"; + label = "green:status"; gpios = <&gpio 24 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7621_zio_freezio.dts b/target/linux/ramips/dts/mt7621_zio_freezio.dts index 647e77dac6..be7e5dcf98 100644 --- a/target/linux/ramips/dts/mt7621_zio_freezio.dts +++ b/target/linux/ramips/dts/mt7621_zio_freezio.dts @@ -10,7 +10,7 @@ compatible = "gpio-leds"; usb { - label = "freezio:green:usb"; + label = "green:usb"; gpios = <&gpio 27 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts b/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts index 1746014b9c..0596dc71d6 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts @@ -21,17 +21,17 @@ compatible = "gpio-leds"; led_status_red: status_red { - label = "wap6805:red:status"; + label = "red:status"; gpios = <&gpio 4 GPIO_ACTIVE_HIGH>; }; status_blink { - label = "wap6805:blink:status"; + label = "blink:status"; gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; }; led_status_green: status_green { - label = "wap6805:green:status"; + label = "green:status"; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts index 699bedf858..13e22e01cd 100644 --- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts +++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts @@ -64,12 +64,12 @@ compatible = "gpio-leds"; led_system: system { - label = "awusfree1:orange:system"; + label = "orange:system"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { - label = "awusfree1:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n10p-v3.dts b/target/linux/ramips/dts/mt7628an_asus_rt-n10p-v3.dts index 2bb8d71906..b638c2138f 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n10p-v3.dts +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n10p-v3.dts @@ -5,29 +5,4 @@ / { compatible = "asus,rt-n10p-v3", "mediatek,mt7628an-soc"; model = "Asus RT-N10P V3"; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "rt-n10p-v3:green:power"; - gpios = <&gpio 37 GPIO_ACTIVE_LOW>; - }; - - wlan { - label = "rt-n10p-v3:green:wlan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wan { - label = "rt-n10p-v3:green:wan"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "rt-n10p-v3:green:lan"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n11p-b1.dts b/target/linux/ramips/dts/mt7628an_asus_rt-n11p-b1.dts index acaeb174b9..d62d4ad480 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n11p-b1.dts +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n11p-b1.dts @@ -5,29 +5,4 @@ / { compatible = "asus,rt-n11p-b1", "mediatek,mt7628an-soc"; model = "Asus RT-N11P B1"; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "rt-n11p-b1:green:power"; - gpios = <&gpio 37 GPIO_ACTIVE_LOW>; - }; - - wlan { - label = "rt-n11p-b1:green:wlan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wan { - label = "rt-n11p-b1:green:wan"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "rt-n11p-b1:green:lan"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n12-vp-b1.dts b/target/linux/ramips/dts/mt7628an_asus_rt-n12-vp-b1.dts index 603a8fa515..8c44c36087 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n12-vp-b1.dts +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n12-vp-b1.dts @@ -5,29 +5,4 @@ / { compatible = "asus,rt-n12-vp-b1", "mediatek,mt7628an-soc"; model = "Asus RT-N12 VP B1"; - - leds { - compatible = "gpio-leds"; - - led_power: power { - label = "rt-n12-vp-b1:green:power"; - gpios = <&gpio 37 GPIO_ACTIVE_LOW>; - }; - - wlan { - label = "rt-n12-vp-b1:green:wlan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wan { - label = "rt-n12-vp-b1:green:wan"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "rt-n12-vp-b1:green:lan"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - }; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi index c3f7d80688..239bb08230 100644 --- a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi +++ b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi @@ -22,6 +22,31 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + led_power: power { + label = "green:power"; + gpios = <&gpio 37 GPIO_ACTIVE_LOW>; + }; + + wlan { + label = "green:wlan"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wan { + label = "green:wan"; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "green:lan"; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + }; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts index 199b12ebde..cb4c61ecbd 100644 --- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts +++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts @@ -41,42 +41,42 @@ compatible = "gpio-leds"; router_o { - label = "wcr-1166ds:orange:router"; + label = "orange:router"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; router_g { - label = "wcr-1166ds:green:router"; + label = "green:router"; gpios = <&gpio 38 GPIO_ACTIVE_LOW>; }; internet_o { - label = "wcr-1166ds:orange:internet"; + label = "orange:internet"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; internet_g { - label = "wcr-1166ds:green:internet"; + label = "green:internet"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wireless_o { - label = "wcr-1166ds:orange:wireless"; + label = "orange:wireless"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wireless_g { - label = "wcr-1166ds:green:wireless"; + label = "green:wireless"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; diag { - label = "wcr-1166ds:orange:diag"; + label = "orange:diag"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wcr-1166ds:green:power"; + label = "green:power"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts index 6cd48ecf29..adc9988600 100644 --- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts +++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts @@ -36,28 +36,28 @@ compatible = "gpio-leds"; lan1 { - label = "wr1000:blue:lan1"; + label = "blue:lan1"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan2 { - label = "wr1000:blue:lan2"; + label = "blue:lan2"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan { - label = "wr1000:blue:wan"; + label = "blue:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "wr1000:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; led_wps: wps { - label = "wr1000:blue:wps"; + label = "blue:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts index c59a86586f..e5c52322b6 100644 --- a/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts +++ b/target/linux/ramips/dts/mt7628an_d-team_pbr-d1.dts @@ -26,14 +26,14 @@ compatible = "gpio-leds"; usb { - label = "pbr-d1:orange:usb"; + label = "orange:usb"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: power { - label = "pbr-d1:orange:power"; + label = "orange:power"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 261771df13..4ebe0cf11f 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -23,18 +23,18 @@ compatible = "gpio-leds"; led_power: power { - label = "gl-mt300n-v2:green:power"; + label = "green:power"; default-state = "on"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wan { - label = "gl-mt300n-v2:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { - label = "gl-mt300n-v2:red:wlan"; + label = "red:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts b/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts index e4f6a92bc0..09afe7211b 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_microuter-n300.dts @@ -7,14 +7,6 @@ model = "GL.iNet microuter-N300"; }; -&led_power_blue { - label = "microuter-n300:blue:power"; -}; - -&led_wlan_white { - label = "microuter-n300:white:wlan"; -}; - &firmware_part { reg = <0x50000 0xfb0000>; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts index 3488b0e386..02c29d1ba0 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini.dts @@ -7,14 +7,6 @@ model = "GL.iNet VIXMINI"; }; -&led_power_blue { - label = "vixmini:blue:power"; -}; - -&led_wlan_white { - label = "vixmini:white:wlan"; -}; - &firmware_part { reg = <0x50000 0x7b0000>; }; diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi index ea43a87372..738968d1f9 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi +++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi @@ -23,12 +23,12 @@ compatible = "gpio-leds"; led_power_blue: power { - /* Name is set device-specific */ + label = "blue:power"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; - led_wlan_white: wlan { - /* Name is set device-specific */ + wlan { + label = "white:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts index 69e033b472..69987b3566 100644 --- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts +++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts @@ -23,7 +23,7 @@ compatible = "gpio-leds"; wlan { - label = "hlk-7628n:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts index 0b2ea26db0..9e4068ce8c 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5661a.dts @@ -8,17 +8,17 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5661a:blue:system"; + label = "blue:system"; gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; }; internet { - label = "hc5661a:blue:internet"; + label = "blue:internet"; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "hc5661a:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts index de00edb3e0..828e5b8b2d 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5761a.dts @@ -10,23 +10,23 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5761a:blue:system"; + label = "blue:system"; gpios = <&gpio 37 GPIO_ACTIVE_HIGH>; }; internet { - label = "hc5761a:blue:internet"; + label = "blue:internet"; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; }; wlan2g { - label = "hc5761a:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "hc5761a:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 40 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy1tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts index ec986f8401..326c412b0e 100644 --- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts @@ -8,12 +8,12 @@ compatible = "gpio-leds"; led_system: system { - label = "hc5861b:green:system"; + label = "green:system"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "hc5861b:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a3.dts b/target/linux/ramips/dts/mt7628an_iptime_a3.dts index 767f8ab2a6..d90a075af5 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a3.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a3.dts @@ -17,12 +17,12 @@ compatible = "gpio-leds"; led_cpu: cpu { - label = "a3:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { - label = "a3:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts index 127a30022f..2f626f1adf 100644 --- a/target/linux/ramips/dts/mt7628an_iptime_a604m.dts +++ b/target/linux/ramips/dts/mt7628an_iptime_a604m.dts @@ -17,18 +17,18 @@ compatible = "gpio-leds"; wlan5g { - label = "a604m:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; led_cpu: cpu { - label = "a604m:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "a604m:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi index 9bd1da4443..3fd173914e 100644 --- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi +++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi @@ -23,12 +23,12 @@ compatible = "gpio-leds"; led_system: system { - label = "js76x8:green:system"; + label = "green:system"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wifi { - label = "js76x8:green:wifi"; + label = "green:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts index d77194b023..cbec8c9d40 100644 --- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts +++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts @@ -32,7 +32,7 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "linkit-smart-7688:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts index 39e02b23f9..7aa678a1ad 100644 --- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts +++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_status: status { - label = "mac1200rv2:green:status"; + label = "green:status"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts index f4b80ae45f..6ae7474331 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts @@ -5,48 +5,6 @@ / { compatible = "netgear,r6020", "mediatek,mt7628an-soc"; model = "Netgear R6020"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - lan { - label = "r6020:green:lan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "r6020:green:power"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wlan2g_green { - label = "r6020:green:wlan2g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wlan2g_orange { - label = "r6020:orange:wlan2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - }; - - wan_green { - label = "r6020:green:wan"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - - wan_orange { - label = "r6020:orange:wan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - }; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts index f062a9fb35..73cfc47a6c 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts @@ -7,47 +7,8 @@ model = "Netgear R6080"; aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; label-mac-device = ðernet; }; - - leds { - compatible = "gpio-leds"; - - lan { - label = "r6080:green:lan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "r6080:green:power"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wlan2g_green { - label = "r6080:green:wlan2g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wlan2g_orange { - label = "r6080:orange:wlan2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - }; - - wan_green { - label = "r6080:green:wan"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - - wan_orange { - label = "r6080:orange:wan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - }; }; &state_default { diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts index ba039983a4..f4d9823cd2 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts +++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts @@ -5,48 +5,9 @@ model = "Netgear R6120"; aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; label-mac-device = ðernet; }; - leds { - compatible = "gpio-leds"; - - lan { - label = "r6120:green:lan"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "r6120:green:power"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wlan2g_green { - label = "r6120:green:wlan2g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wlan2g_orange { - label = "r6120:orange:wlan2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - }; - - wan_green { - label = "r6120:green:wan"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - - wan_orange { - label = "r6120:orange:wan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - }; - usb-regulator { compatible = "regulator-fixed"; diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi index 640591c316..c3d7da2f09 100644 --- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi +++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi @@ -6,6 +6,13 @@ #include / { + aliases { + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; + keys { compatible = "gpio-keys"; @@ -15,6 +22,41 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + lan { + label = "green:lan"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + led_power: power { + label = "green:power"; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + + wlan2g_green { + label = "green:wlan2g"; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan2g_orange { + label = "orange:wlan2g"; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; + }; + + wan_green { + label = "green:wan"; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; + }; + + wan_orange { + label = "orange:wan"; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; + }; + }; }; &spi0 { diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dts b/target/linux/ramips/dts/mt7628an_onion_omega2.dts index f9038adc30..a34638bb0e 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dts +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dts @@ -8,7 +8,3 @@ &firmware { reg = <0x50000 0xfb0000>; }; - -&system_led { - label = "omega2:amber:system"; -}; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi index 04187a8353..b6d2df4756 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi +++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi @@ -7,10 +7,10 @@ compatible = "onion,omega2", "mediatek,mt7628an-soc"; aliases { - led-boot = &system_led; - led-failsafe = &system_led; - led-running = &system_led; - led-upgrade = &system_led; + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; }; chosen { @@ -20,7 +20,8 @@ leds { compatible = "gpio-leds"; - system_led: system { + led_system: system { + label = "amber:system"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2p.dts b/target/linux/ramips/dts/mt7628an_onion_omega2p.dts index 085766eb68..4ec07dbd91 100644 --- a/target/linux/ramips/dts/mt7628an_onion_omega2p.dts +++ b/target/linux/ramips/dts/mt7628an_onion_omega2p.dts @@ -8,7 +8,3 @@ &firmware { reg = <0x50000 0x1fb0000>; }; - -&system_led { - label = "omega2p:amber:system"; -}; diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts index 32b119c51d..63c4901ec2 100644 --- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts +++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts @@ -13,7 +13,7 @@ compatible = "gpio-leds"; wifi { - label = "rak633:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts index 66ffa77379..95d7750be0 100644 --- a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts +++ b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts @@ -24,29 +24,29 @@ compatible = "gpio-leds"; led_globe: globe { - label = "rp-wd009:white:globe"; + label = "white:globe"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan2 { - label = "rp-wd009:white:wlan2"; + label = "white:wlan2"; gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; wlan5 { - label = "rp-wd009:white:wlan5"; + label = "white:wlan5"; gpios = <&gpio 18 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; sd_white { - label = "rp-wd009:white:sd"; + label = "white:sd"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; sd_red { - label = "rp-wd009:red:sd"; + label = "red:sd"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index fec5b1d375..111f70a8d5 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_power: wps { - label = "skw92a:green:wps"; + label = "green:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan { - label = "skw92a:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index 8cadd6718f..26e5ab00a5 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -11,17 +11,17 @@ compatible = "gpio-leds"; wps { - label = "w06:green:wps"; + label = "green:wps"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { - label = "w06:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wireless { - label = "w06:green:wlan"; + label = "green:wlan"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_a3.dts b/target/linux/ramips/dts/mt7628an_totolink_a3.dts index 69903f4e67..246dfadddd 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_a3.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_a3.dts @@ -17,12 +17,12 @@ compatible = "gpio-leds"; led_cpu: cpu { - label = "a3:blue:cpu"; + label = "blue:cpu"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { - label = "a3:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts index 826e07a85e..ab5fdd3246 100644 --- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts +++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts @@ -20,48 +20,48 @@ compatible = "gpio-leds"; led_sys: sys { - label = "lr1200:blue:sys"; + label = "blue:sys"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; sms { - label = "lr1200:blue:sms"; + label = "blue:sms"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wifi { - label = "lr1200:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; 3g { - label = "lr1200:blue:3g"; + label = "blue:3g"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; 4g { - label = "lr1200:blue:4g"; + label = "blue:4g"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; rssi1 { - label = "lr1200:blue:rssi1"; + label = "blue:rssi1"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; rssi2 { - label = "lr1200:blue:rssi2"; + label = "blue:rssi2"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; rssi3 { - label = "lr1200:blue:rssi3"; + label = "blue:rssi3"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; rssi4 { - label = "lr1200:blue:rssi4"; + label = "blue:rssi4"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts index 4a8d2b440b..f6321bb15f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts @@ -15,39 +15,39 @@ compatible = "gpio-leds"; lan { - label = "archer-c20-v4:green:lan"; + label = "green:lan"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "archer-c20-v4:green:power"; + label = "green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-c20-v4:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "archer-c20-v4:orange:wan"; + label = "orange:wan"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan5g { - label = "archer-c20-v4:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; wlan2g { - label = "archer-c20-v4:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps { - label = "archer-c20-v4:green:wps"; + label = "green:wps"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts index 1d39ccbf73..7969bfc733 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts @@ -33,39 +33,39 @@ compatible = "gpio-leds"; led_power: power { - label = "archer-c20-v5:green:power"; + label = "green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "archer-c20-v5:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "archer-c20-v5:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; lan { - label = "archer-c20-v5:green:lan"; + label = "green:lan"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wan_green { - label = "archer-c20-v5:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "archer-c20-v5:orange:wan"; + label = "orange:wan"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wps { - label = "archer-c20-v5:green:wps"; + label = "green:wps"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts index 2e386a05bf..ea53870eeb 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts @@ -31,37 +31,37 @@ compatible = "gpio-leds"; lan { - label = "archer-c50-v3:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "archer-c50-v3:green:power"; + label = "green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-c50-v3:green:wan"; + label = "green:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "archer-c50-v3:orange:wan"; + label = "orange:wan"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wlan { - label = "archer-c50-v3:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan5 { - label = "archer-c50-v3:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; wps { - label = "archer-c50-v3:green:wps"; + label = "green:wps"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts index bf9701cfbe..4ca0cd61a5 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts @@ -33,37 +33,37 @@ compatible = "gpio-leds"; led_power: power { - label = "archer-c50-v4:green:power"; + label = "green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan2 { - label = "archer-c50-v4:green:wlan2g"; + label = "green:wlan2g"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan5 { - label = "archer-c50-v4:green:wlan5g"; + label = "green:wlan5g"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan { - label = "archer-c50-v4:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan { - label = "archer-c50-v4:green:wan"; + label = "green:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "archer-c50-v4:orange:wan"; + label = "orange:wan"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wps { - label = "archer-c50-v4:green:wps"; + label = "green:wps"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts index db3cd4051f..a7e5e5110d 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re200-v2.dts @@ -5,65 +5,4 @@ / { compatible = "tplink,re200-v2", "mediatek,mt7628an-soc"; model = "TP-Link RE200 v2"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wps { - label = "re200-v2:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; - }; - - wifi { - label = "re200-v2:green:wifi"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "re200-v2:green:lan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "re200-v2:green:power"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - wifi2g_green { - label = "re200-v2:green:wifi2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wifi5g_green { - label = "re200-v2:green:wifi5g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - wifi2g_red { - label = "re200-v2:red:wifi2g"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wifi5g_red { - label = "re200-v2:red:wifi5g"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&state_default { - gpio { - groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", - "p0led_an", "wled_an", "i2c", "wdt", "refclk"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_re200-v3.dts index 589e11fbed..2c4e09ee2e 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re200-v3.dts @@ -5,65 +5,4 @@ / { compatible = "tplink,re200-v3", "mediatek,mt7628an-soc"; model = "TP-Link RE200 v3"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wps { - label = "re200-v3:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; - }; - - wifi { - label = "re200-v3:green:wifi"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "re200-v3:green:lan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "re200-v3:green:power"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - wifi2g_green { - label = "re200-v3:green:wifi2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wifi5g_green { - label = "re200-v3:green:wifi5g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - wifi2g_red { - label = "re200-v3:red:wifi2g"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wifi5g_red { - label = "re200-v3:red:wifi5g"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&state_default { - gpio { - groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", - "p0led_an", "wled_an", "i2c", "wdt", "refclk"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi index 2b06fe77a2..95addff3c0 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi +++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi @@ -8,6 +8,10 @@ / { aliases { label-mac-device = ðernet; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { @@ -29,6 +33,52 @@ linux,code = ; }; }; + + leds { + compatible = "gpio-leds"; + + wps { + label = "green:wps"; + gpios = <&gpio 5 GPIO_ACTIVE_LOW>; + }; + + wifi { + label = "green:wifi"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + }; + + lan { + label = "green:lan"; + gpios = <&gpio 39 GPIO_ACTIVE_LOW>; + }; + + led_power: power { + label = "green:power"; + gpios = <&gpio 44 GPIO_ACTIVE_LOW>; + }; + + wifi2g_green { + label = "green:wifi2g"; + gpios = <&gpio 41 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wifi5g_green { + label = "green:wifi5g"; + gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + wifi2g_red { + label = "red:wifi2g"; + gpios = <&gpio 43 GPIO_ACTIVE_LOW>; + }; + + wifi5g_red { + label = "red:wifi5g"; + gpios = <&gpio 40 GPIO_ACTIVE_LOW>; + }; + }; }; &spi0 { @@ -71,6 +121,14 @@ }; }; +&state_default { + gpio { + groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", + "p0led_an", "wled_an", "i2c", "wdt", "refclk"; + function = "gpio"; + }; +}; + ðernet { mtd-mac-address = <&config 0x2008>; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re220-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_re220-v2.dts index 4a73557393..82d385a24d 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re220-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re220-v2.dts @@ -5,65 +5,4 @@ / { compatible = "tplink,re220-v2", "mediatek,mt7628an-soc"; model = "TP-Link RE220 v2"; - - aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; - - leds { - compatible = "gpio-leds"; - - wps { - label = "re220-v2:green:wps"; - gpios = <&gpio 5 GPIO_ACTIVE_LOW>; - }; - - wifi { - label = "re220-v2:green:wifi"; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - }; - - lan { - label = "re220-v2:green:lan"; - gpios = <&gpio 39 GPIO_ACTIVE_LOW>; - }; - - led_power: power { - label = "re220-v2:green:power"; - gpios = <&gpio 44 GPIO_ACTIVE_LOW>; - }; - - wifi2g_green { - label = "re220-v2:green:wifi2g"; - gpios = <&gpio 41 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy0tpt"; - }; - - wifi5g_green { - label = "re220-v2:green:wifi5g"; - gpios = <&gpio 42 GPIO_ACTIVE_LOW>; - linux,default-trigger = "phy1tpt"; - }; - - wifi2g_red { - label = "re220-v2:red:wifi2g"; - gpios = <&gpio 43 GPIO_ACTIVE_LOW>; - }; - - wifi5g_red { - label = "re220-v2:red:wifi5g"; - gpios = <&gpio 40 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&state_default { - gpio { - groups = "p4led_an", "p3led_an", "p2led_an", "p1led_an", - "p0led_an", "wled_an", "i2c", "wdt", "refclk"; - function = "gpio"; - }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts index e8d31c2b7f..22e15eb7a1 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts @@ -37,29 +37,29 @@ compatible = "gpio-leds"; led_power: power { - label = "re305-v1:blue:power"; + label = "blue:power"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan2g { - label = "re305-v1:blue:wlan2g"; + label = "blue:wlan2g"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wlan5g { - label = "re305-v1:blue:wlan5g"; + label = "blue:wlan5g"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; rssi1 { - label = "re305-v1:red:rssi"; + label = "red:rssi"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; rssi2 { - label = "re305-v1:blue:rssi"; + label = "blue:rssi"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index 3682bb6f28..a45019e2d0 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -44,31 +44,31 @@ compatible = "gpio-leds"; led_power: power { - label = "tl-mr3020-v3:green:power"; + label = "green:power"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; default-state = "on"; }; wan { - label = "tl-mr3020-v3:green:3g"; + label = "green:3g"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; trigger-sources = <&ehci_port1>, <&ohci_port1>; linux,default-trigger = "usbport"; }; wlan { - label = "tl-mr3020-v3:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps { - label = "tl-mr3020-v3:green:wps"; + label = "green:wps"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; lan { - label = "tl-mr3020-v3:green:lan"; + label = "green:lan"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts index fb81929b6e..8e602331f3 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts @@ -31,39 +31,39 @@ compatible = "gpio-leds"; lan { - label = "tl-mr3420-v5:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "tl-mr3420-v5:green:power"; + label = "green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; usb { - label = "tl-mr3420-v5:green:usb"; + label = "green:usb"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { - label = "tl-mr3420-v5:green:wan"; + label = "green:wan"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wan_amber { - label = "tl-mr3420-v5:amber:wan"; + label = "amber:wan"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-mr3420-v5:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-mr3420-v5:green:wps"; + label = "green:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts index c46d36b910..21c09ec5d9 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts @@ -31,28 +31,28 @@ compatible = "gpio-leds"; led_power: power { - label = "tl-wa801nd-v5:green:power"; + label = "green:power"; gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; lan { - label = "tl-wa801nd-v5:green:lan"; + label = "green:lan"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wa801nd-v5:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps_red { - label = "tl-wa801nd-v5:red:wps"; + label = "red:wps"; gpios = <&gpio 43 GPIO_ACTIVE_HIGH>; }; wps_green { - label = "tl-wa801nd-v5:green:wps"; + label = "green:wps"; gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts index 138d8a8ab4..d6077b4c0e 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts @@ -27,7 +27,7 @@ compatible = "gpio-leds"; led_power: power { - label = "tl-wr802n-v4:green:power"; + label = "green:power"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts index 81b1da7cd2..f960a0ae8f 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts @@ -25,27 +25,27 @@ compatible = "gpio-leds"; lan { - label = "tl-wr840n-v4:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "tl-wr840n-v4:green:power"; + label = "green:power"; gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; wan { - label = "tl-wr840n-v4:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wr840n-v4:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-wr840n-v4:green:wps"; + label = "green:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts index 72b6e71634..1f8f7f4bab 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts @@ -33,12 +33,12 @@ compatible = "gpio-leds"; led_power_green: power { - label = "tl-wr840n-v5:green:power"; + label = "green:power"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; orange { - label = "tl-wr840n-v5:orange:power"; + label = "orange:power"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts index bf37f01d98..c4c83b8549 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts @@ -31,47 +31,47 @@ compatible = "gpio-leds"; led_power: power { - label = "tl-wr841n-v13:green:power"; + label = "green:power"; gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-wr841n-v13:green:wps"; + label = "green:wps"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; lan1 { - label = "tl-wr841n-v13:green:lan1"; + label = "green:lan1"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan2 { - label = "tl-wr841n-v13:green:lan2"; + label = "green:lan2"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; lan3 { - label = "tl-wr841n-v13:green:lan3"; + label = "green:lan3"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan4 { - label = "tl-wr841n-v13:green:lan4"; + label = "green:lan4"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_green { - label = "tl-wr841n-v13:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wan_orange { - label = "tl-wr841n-v13:orange:wan"; + label = "orange:wan"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wr841n-v13:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts index f47b82a167..a1a83bf237 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts @@ -13,8 +13,6 @@ led-boot = &led_wlan; led-failsafe = &led_wlan; led-upgrade = &led_wlan; - - led-wlan = &led_wlan; }; chosen { @@ -35,23 +33,23 @@ compatible = "gpio-leds"; lan { - label = "tl-wr841n-v14:green:lan"; + label = "green:lan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wan_green { - label = "tl-wr841n-v14:green:wan"; + label = "green:wan"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; led_wlan: wlan { - label = "tl-wr841n-v14:green:wlan"; + label = "green:wlan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wan_orange { - label = "tl-wr841n-v14:orange:wan"; + label = "orange:wan"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts index aa0eb332fe..e843672600 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts @@ -31,39 +31,39 @@ compatible = "gpio-leds"; lan { - label = "tl-wr842n-v5:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "tl-wr842n-v5:green:power"; + label = "green:power"; gpios = <&gpio 2 GPIO_ACTIVE_LOW>; }; usb { - label = "tl-wr842n-v5:green:usb"; + label = "green:usb"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { - label = "tl-wr842n-v5:green:wan"; + label = "green:wan"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wan_amber { - label = "tl-wr842n-v5:amber:wan"; + label = "amber:wan"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wr842n-v5:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-wr842n-v5:green:wps"; + label = "green:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts index d1c2de7acc..1fec73d4dc 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts @@ -27,27 +27,27 @@ compatible = "gpio-leds"; led_power: power { - label = "tl-wr850n-v2:green:power"; + label = "green:power"; gpios = <&gpio 36 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-wr850n-v2:green:wps"; + label = "green:wps"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; lan { - label = "tl-wr850n-v2:green:lan"; + label = "green:lan"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; wan { - label = "tl-wr850n-v2:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wr850n-v2:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts index b9e20ac86a..bce394747b 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts @@ -43,34 +43,34 @@ compatible = "gpio-leds"; lan { - label = "tl-wr902ac-v3:green:lan"; + label = "green:lan"; gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; }; led_power: power { - label = "tl-wr902ac-v3:green:power"; + label = "green:power"; gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; usb { - label = "tl-wr902ac-v3:green:usb"; + label = "green:usb"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wan { - label = "tl-wr902ac-v3:green:wan"; + label = "green:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; wlan { - label = "tl-wr902ac-v3:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { - label = "tl-wr902ac-v3:green:wps"; + label = "green:wps"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi index 69f371a724..4facb036fd 100644 --- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi +++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi @@ -65,42 +65,42 @@ compatible = "gpio-leds"; led_power: power { - label = "u7628-01:green:power"; + label = "green:power"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wlan { - label = "u7628-01:green:wlan"; + label = "green:wlan"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wan { - label = "u7628-01:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; lan1 { - label = "u7628-01:green:lan1"; + label = "green:lan1"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; lan2 { - label = "u7628-01:green:lan2"; + label = "green:lan2"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; lan3 { - label = "u7628-01:green:lan3"; + label = "green:lan3"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; lan4 { - label = "u7628-01:green:lan4"; + label = "green:lan4"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; usb { - label = "u7628-01:green:usb"; + label = "green:usb"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts index a8d5f8550c..f8bdc27c4c 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts @@ -15,7 +15,7 @@ compatible = "gpio-leds"; led_status: status { - label = "vocore2lite:green:status"; + label = "green:status"; gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts index 1ba767ce4f..f4bb8720d3 100644 --- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts +++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts @@ -15,7 +15,7 @@ compatible = "gpio-leds"; led_status: status { - label = "vocore2:fuchsia:status"; + label = "fuchsia:status"; gpios = <&gpio 44 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts index aa9957892f..9cea8b43f3 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts @@ -21,33 +21,33 @@ compatible = "gpio-leds"; power { - label = "wl-wn570ha1:green:power"; + label = "green:power"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; default-state = "keep"; }; wan { - label = "wl-wn570ha1:green:wan"; + label = "green:wan"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; wifi-high { - label = "wl-wn570ha1:green:wifi-high"; + label = "green:wifi-high"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wifi-med { - label = "wl-wn570ha1:green:wifi-med"; + label = "green:wifi-med"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; wifi-low { - label = "wl-wn570ha1:green:wifi-low"; + label = "green:wifi-low"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; wifi { - label = "wl-wn570ha1:green:wifi"; + label = "green:wifi"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts index 6316539f28..d6d418f1b9 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts @@ -27,22 +27,22 @@ compatible = "gpio-leds"; wifi-high { - label = "wl-wn575a3:green:wifi-high"; + label = "green:wifi-high"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; wifi-med { - label = "wl-wn575a3:green:wifi-med"; + label = "green:wifi-med"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; wifi-low { - label = "wl-wn575a3:green:wifi-low"; + label = "green:wifi-low"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wps { - label = "wl-wn575a3:green:wps"; + label = "green:wps"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts index 2f93ebd3e6..b5f8ff03a8 100644 --- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts +++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts @@ -36,17 +36,17 @@ compatible = "gpio-leds"; lan { - label = "wl-wn577a2:green:lan"; + label = "green:lan"; gpios = <&gpio 40 GPIO_ACTIVE_LOW>; }; wan { - label = "wl-wn577a2:green:wan"; + label = "green:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "wl-wn577a2:green:wps"; + label = "green:wps"; gpios = <&gpio 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi index 252ffd71f5..4c60ad95aa 100644 --- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi +++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi @@ -21,7 +21,7 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "widora:orange:wifi"; + label = "orange:wifi"; gpios = <&wgpio 0 GPIO_ACTIVE_HIGH>; default-state = "on"; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 7cd9bef62b..670edaa78d 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -26,22 +26,22 @@ compatible = "gpio-leds"; led_run: run { - label = "wizfi630s:green:run"; + label = "green:run"; gpios = <&gpio 5 GPIO_ACTIVE_LOW>; }; ledwps { - label = "wizfi630s:green:wps"; + label = "green:wps"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; leduart1 { - label = "wizfi630s:green:uart1"; + label = "green:uart1"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; leduart2 { - label = "wizfi630s:green:uart2"; + label = "green:uart2"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts index 54799d812c..88ec3f0c30 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts @@ -15,7 +15,7 @@ compatible = "gpio-leds"; led_indicator: indicator { - label = "wrtnode:blue:indicator"; + label = "blue:indicator"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts index 92bea362e3..511354ae5e 100644 --- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts +++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts @@ -18,7 +18,7 @@ pinctrl-0 = <&led_pins>; led_indicator: indicator { - label = "wrtnode:blue:indicator"; + label = "blue:indicator"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts index a89ed49a70..727c27d573 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts @@ -24,12 +24,12 @@ compatible = "gpio-leds"; power_blue: power_blue { - label = "mir4a-100m:blue:power"; + label = "blue:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; power_yellow: power_yellow { - label = "mir4a-100m:yellow:power"; + label = "yellow:power"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts index dbb4571d7b..ae6a72ebc3 100644 --- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts +++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts @@ -23,17 +23,17 @@ compatible = "gpio-leds"; led_status_blue: status_blue { - label = "miwifi-nano:blue:status"; + label = "blue:status"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; led_status_red: status_red { - label = "miwifi-nano:red:status"; + label = "red:status"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; led_status_amber: status_amber { - label = "miwifi-nano:amber:status"; + label = "amber:status"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts index 7f4f290822..ac2a01eaba 100644 --- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts +++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts @@ -32,22 +32,22 @@ compatible = "gpio-leds"; wan { - label = "zbt-we1226:green:wan"; + label = "green:wan"; gpios = <&gpio 39 GPIO_ACTIVE_LOW>; }; lan1 { - label = "zbt-we1226:green:lan1"; + label = "green:lan1"; gpios = <&gpio 43 GPIO_ACTIVE_LOW>; }; lan2 { - label = "zbt-we1226:green:lan2"; + label = "green:lan2"; gpios = <&gpio 42 GPIO_ACTIVE_LOW>; }; led_wlan: wlan { - label = "zbt-we1226:green:wlan"; + label = "green:wlan"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index efb5161957..47e4b429a9 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -44,23 +44,23 @@ compatible = "gpio-leds"; led_power: power { - label = "keenetic-extra-ii:green:power"; + label = "green:power"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; default-state = "keep"; }; internet { - label = "keenetic-extra-ii:green:internet"; + label = "green:internet"; gpios = <&gpio 44 GPIO_ACTIVE_LOW>; }; wifi { - label = "keenetic-extra-ii:green:wifi"; + label = "green:wifi"; gpios = <&gpio 37 GPIO_ACTIVE_LOW>; }; usb { - label = "keenetic-extra-ii:green:usb"; + label = "green:usb"; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts index 0c04b24111..213868db86 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts @@ -48,12 +48,12 @@ compatible = "gpio-leds"; led_power: power { - label = "ar670w:green:power"; + label = "green:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wpsblue { - label = "ar670w:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts index 9673b21ba9..fb3eeda8aa 100644 --- a/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts +++ b/target/linux/ramips/dts/rt2880_airlink101_ar725w.dts @@ -53,17 +53,17 @@ compatible = "gpio-leds"; led_power: power { - label = "ar725w:green:power"; + label = "green:power"; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; }; wpsred { - label = "ar725w:red:wps"; + label = "red:wps"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; wpsblue { - label = "ar725w:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts index af7f2929a3..713c64cb56 100644 --- a/target/linux/ramips/dts/rt2880_asus_rt-n15.dts +++ b/target/linux/ramips/dts/rt2880_asus_rt-n15.dts @@ -80,7 +80,7 @@ compatible = "gpio-leds"; led_power: power { - label = "rt-n15:blue:power"; + label = "blue:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts index c099f2b0ca..bc146cf677 100644 --- a/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts +++ b/target/linux/ramips/dts/rt2880_belkin_f5d8235-v1.dts @@ -119,69 +119,69 @@ compatible = "gpio-leds"; internet { - label = "f5d8235-v1:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; internet2 { - label = "f5d8235-v1:amber:internet"; + label = "amber:internet"; gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; }; modem { - label = "f5d8235-v1:blue:modem"; + label = "blue:modem"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; modem2 { - label = "f5d8235-v1:amber:modem"; + label = "amber:modem"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; router { - label = "f5d8235-v1:blue:router"; + label = "blue:router"; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; storage { - label = "f5d8235-v1:blue:storage"; + label = "blue:storage"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; storage2 { - label = "f5d8235-v1:amber:storage"; + label = "amber:storage"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; security { - label = "f5d8235-v1:blue:security"; + label = "blue:security"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; security2 { - label = "f5d8235-v1:amber:security"; + label = "amber:security"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; led_wired_blue: wired { - label = "f5d8235-v1:blue:wired"; + label = "blue:wired"; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; }; wired2 { - label = "f5d8235-v1:amber:wired"; + label = "amber:wired"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; wireless { - label = "f5d8235-v1:blue:wireless"; + label = "blue:wireless"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; wireless2 { - label = "f5d8235-v1:amber:wireless"; + label = "amber:wireless"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts index 51a508f60f..3ec9140b18 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wli-tx4-ag300n.dts @@ -80,17 +80,17 @@ compatible = "gpio-leds"; diag { - label = "wli-tx4-ag300n:red:diag"; + label = "red:diag"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wli-tx4-ag300n:blue:power"; + label = "blue:power"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; security { - label = "wli-tx4-ag300n:blue:security"; + label = "blue:security"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts index 13f933b639..9c3a07059f 100644 --- a/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts +++ b/target/linux/ramips/dts/rt2880_buffalo_wzr-agl300nh.dts @@ -86,22 +86,22 @@ compatible = "gpio-leds"; led_router: router { - label = "wzr-agl300nh:green:router"; + label = "green:router"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; diag { - label = "wzr-agl300nh:red:diag"; + label = "red:diag"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; security_g { - label = "wzr-agl300nh:orange:security_g"; + label = "orange:security_g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; security_n { - label = "wzr-agl300nh:orange:security_n"; + label = "orange:security_n"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts index acb723eff7..c01424a1f0 100644 --- a/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts +++ b/target/linux/ramips/dts/rt2880_dlink_dap-1522-a1.dts @@ -86,22 +86,22 @@ compatible = "gpio-leds"; wps { - label = "dap-1522-a1:blue:wps"; + label = "blue:wps"; gpios = <&gpio2 17 GPIO_ACTIVE_LOW>; }; ap { - label = "dap-1522-a1:blue:ap"; + label = "blue:ap"; gpios = <&gpio2 18 GPIO_ACTIVE_LOW>; }; sta { - label = "dap-1522-a1:red:sta"; + label = "red:sta"; gpios = <&gpio2 19 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "dap-1522-a1:blue:status"; + label = "blue:status"; gpios = <&gpio2 20 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts b/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts index b9a3fb88c7..792a2e429f 100644 --- a/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts +++ b/target/linux/ramips/dts/rt2880_ralink_v11st-fe.dts @@ -65,7 +65,7 @@ compatible = "gpio-leds"; led_status: status { - label = "v11st-fe:green:status"; + label = "green:status"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi index 40018e5e3f..27d0eb3e4f 100644 --- a/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi +++ b/target/linux/ramips/dts/rt3050_allnet_all0256n.dtsi @@ -10,17 +10,17 @@ compatible = "gpio-leds"; rssilow { - label = "all0256n:green:rssilow"; + label = "green:rssilow"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; rssimed { - label = "all0256n:green:rssimed"; + label = "green:rssimed"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; rssihigh { - label = "all0256n:green:rssihigh"; + label = "green:rssihigh"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi index be57cd8e57..b476fd4fa4 100644 --- a/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi +++ b/target/linux/ramips/dts/rt3050_alphanetworks_asl26555.dtsi @@ -34,44 +34,44 @@ compatible = "gpio-leds"; eth { - label = "asl26555:green:eth"; + label = "green:eth"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; wan-red { - label = "asl26555:red:wan"; + label = "red:wan"; gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; }; wan-green { - label = "asl26555:green:wan"; + label = "green:wan"; gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; }; wlan { - label = "asl26555:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; }; led_power_green: power-green { - label = "asl26555:green:power"; + label = "green:power"; gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; power-red { - label = "asl26555:red:power"; + label = "red:power"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; 3g-green { - label = "asl26555:green:3g"; + label = "green:3g"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; 3g-red { - label = "asl26555:red:3g"; + label = "red:3g"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts index d0385bf0b7..44b2ad4185 100644 --- a/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts +++ b/target/linux/ramips/dts/rt3050_arcwireless_freestation5.dts @@ -70,17 +70,17 @@ * not present in the Freestation5 device. */ wifi { - label = "freestation5:unknown:wifi"; + label = "unknown:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; powerg { - label = "freestation5:unknown:powerg"; + label = "unknown:powerg"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; usb { - label = "freestation5:unknown:usb"; + label = "unknown:usb"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts index 7d28f0b7f6..5c1975595f 100644 --- a/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts +++ b/target/linux/ramips/dts/rt3050_asus_rt-n10-plus.dts @@ -55,7 +55,7 @@ compatible = "gpio-leds"; led_wps: wps { - label = "rt-n10-plus:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts index d3cd092eb9..cc6cd38246 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; link { - label = "wl-330n:blue:link"; + label = "blue:link"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wl-330n:blue:power"; + label = "blue:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts index b0f148e94e..c2513c5dd5 100644 --- a/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts +++ b/target/linux/ramips/dts/rt3050_asus_wl-330n3g.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; 3g { - label = "wl-330n3g:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; 3g2 { - label = "wl-330n3g:red:3g"; + label = "red:3g"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "wl-330n3g:blue:power"; + label = "blue:power"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts index fa4fd6258f..ff01fe2709 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dcs-930.dts @@ -55,17 +55,17 @@ compatible = "gpio-leds"; wifi { - label = "dcs-930:red:alert"; + label = "red:alert"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "dcs-930:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "dcs-930:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts index b6ada35495..7699dcaabb 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-300-b1.dts @@ -72,27 +72,27 @@ compatible = "gpio-leds"; status { - label = "dir-300-b1:amber:status"; + label = "amber:status"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_status_green: status2 { - label = "dir-300-b1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wan { - label = "dir-300-b1:amber:wan"; + label = "amber:wan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wan2 { - label = "dir-300-b1:green:wan"; + label = "green:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-300-b1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts index 65a5ea638f..21f0a73212 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-600-b1.dts @@ -72,27 +72,27 @@ compatible = "gpio-leds"; status { - label = "dir-600-b1:amber:status"; + label = "amber:status"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_status_green: status2 { - label = "dir-600-b1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wan { - label = "dir-600-b1:amber:wan"; + label = "amber:wan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wan2 { - label = "dir-600-b1:green:wan"; + label = "green:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-600-b1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts index cfe77941fd..e84c9d9cb7 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-615-d.dts @@ -73,28 +73,28 @@ compatible = "gpio-leds"; status_amber { - label = "dir-615-d:amber:status"; + label = "amber:status"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_status_green: status_green { - label = "dir-615-d:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; default-state = "on"; }; wan_amber { - label = "dir-615-d:amber:wan"; + label = "amber:wan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wan_green { - label = "dir-615-d:green:wan"; + label = "green:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-615-d:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts index e23e6f8995..c134803f67 100644 --- a/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts +++ b/target/linux/ramips/dts/rt3050_dlink_dir-620-a1.dts @@ -72,32 +72,32 @@ compatible = "gpio-leds"; status { - label = "dir-620-a1:amber:status"; + label = "amber:status"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_status_green: status2 { - label = "dir-620-a1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wan { - label = "dir-620-a1:amber:wan"; + label = "amber:wan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wan2 { - label = "dir-620-a1:green:wan"; + label = "green:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-620-a1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; wps2 { - label = "dir-620-a1:amber:wps"; + label = "amber:wps"; gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts index 45b80743bd..a185e5d5bb 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200n.dts @@ -61,17 +61,17 @@ compatible = "gpio-leds"; led_power: power { - label = "3g-6200n:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan { - label = "3g-6200n:amber:wlan"; + label = "amber:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; 3g { - label = "3g-6200n:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts index fd965e85dc..41768078f5 100644 --- a/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts +++ b/target/linux/ramips/dts/rt3050_edimax_3g-6200nl.dts @@ -61,12 +61,12 @@ compatible = "gpio-leds"; led_internet: internet { - label = "3g-6200nl:green:internet"; + label = "green:internet"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan { - label = "3g-6200nl:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_huawei_d105.dts b/target/linux/ramips/dts/rt3050_huawei_d105.dts index 2dc57392ea..2784b0c580 100644 --- a/target/linux/ramips/dts/rt3050_huawei_d105.dts +++ b/target/linux/ramips/dts/rt3050_huawei_d105.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_power: power { - label = "d105:red:power"; + label = "red:power"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; usb { - label = "d105:green:usb"; + label = "green:usb"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts index 4a14003147..581edc6dfc 100644 --- a/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts +++ b/target/linux/ramips/dts/rt3050_jcg_jhr-n805r.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_system: system { - label = "jhr-n805r:blue:system"; + label = "blue:system"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_netcore_nw718.dts b/target/linux/ramips/dts/rt3050_netcore_nw718.dts index 116864a443..124a2ba13c 100644 --- a/target/linux/ramips/dts/rt3050_netcore_nw718.dts +++ b/target/linux/ramips/dts/rt3050_netcore_nw718.dts @@ -18,19 +18,19 @@ compatible = "gpio-leds"; led_cpu: cpu { - label = "nw718:amber:cpu"; + label = "amber:cpu"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; usb { - label = "nw718:amber:usb"; + label = "amber:usb"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; wps { - label = "nw718:amber:wps"; + label = "amber:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts index 73ed778ae8..e457491906 100644 --- a/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts +++ b/target/linux/ramips/dts/rt3050_sparklan_wcr-150gn.dts @@ -55,14 +55,14 @@ compatible = "gpio-leds"; user { - label = "wcr-150gn:amber:user"; + label = "amber:user"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; led_power: power { - label = "wcr-150gn:amber:power"; + label = "amber:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts index 13f2141b72..742edbb11d 100644 --- a/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts +++ b/target/linux/ramips/dts/rt3050_teltonika_rut5xx.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_status: status { - label = "rut5xx:green:status"; + label = "green:status"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_tenda_w150m.dts b/target/linux/ramips/dts/rt3050_tenda_w150m.dts index 7ba3a6a810..2826993a9a 100644 --- a/target/linux/ramips/dts/rt3050_tenda_w150m.dts +++ b/target/linux/ramips/dts/rt3050_tenda_w150m.dts @@ -55,32 +55,32 @@ compatible = "gpio-leds"; 3grouter { - label = "w150m:blue:3grouter"; + label = "blue:3grouter"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_ap: ap { - label = "w150m:blue:ap"; + label = "blue:ap"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wisprouter { - label = "w150m:blue:wisprouter"; + label = "blue:wisprouter"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wirelessrouter { - label = "w150m:blue:wirelessrouter"; + label = "blue:wirelessrouter"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; 3g { - label = "w150m:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wpsreset { - label = "w150m:blue:wpsreset"; + label = "blue:wpsreset"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts index 80eb9c09e4..7df592bebd 100644 --- a/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts +++ b/target/linux/ramips/dts/rt3050_trendnet_tew-638apb-v2.dts @@ -72,12 +72,12 @@ compatible = "gpio-leds"; wps { - label = "tew-638apb-v2:orange:wps"; + label = "orange:wps"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_wps_green: wps2 { - label = "tew-638apb-v2:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_accton_wr6202.dts b/target/linux/ramips/dts/rt3052_accton_wr6202.dts index fa9d28ec16..fac721cd76 100644 --- a/target/linux/ramips/dts/rt3052_accton_wr6202.dts +++ b/target/linux/ramips/dts/rt3052_accton_wr6202.dts @@ -15,12 +15,12 @@ compatible = "gpio-leds"; wps { - label = "wr6202:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; 3g { - label = "wr6202:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts index 1a43f61959..d88df8ca25 100644 --- a/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts +++ b/target/linux/ramips/dts/rt3052_alfa-network_w502u.dts @@ -59,14 +59,14 @@ compatible = "gpio-leds"; usb { - label = "w502u:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "w502u:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts index 84341ea9e0..39afaa582e 100644 --- a/target/linux/ramips/dts/rt3052_argus_atp-52b.dts +++ b/target/linux/ramips/dts/rt3052_argus_atp-52b.dts @@ -53,12 +53,12 @@ compatible = "gpio-leds"; led_run: run { - label = "atp-52b:green:run"; + label = "green:run"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; net { - label = "atp-52b:amber:net"; + label = "amber:net"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts index 33e04bbb04..5d73043425 100644 --- a/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts +++ b/target/linux/ramips/dts/rt3052_asiarf_awapn2403.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_wps: wps { - label = "awapn2403:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts index 0d0b70e4fc..a67a839dcc 100644 --- a/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts +++ b/target/linux/ramips/dts/rt3052_asus_rt-n13u.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_power: power { - label = "rt-n13u:blue:power"; + label = "blue:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wifi { - label = "rt-n13u:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts index d9e9554f06..2d5f07746f 100644 --- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts +++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts @@ -65,19 +65,19 @@ compatible = "gpio-leds"; usb { - label = "mr-102n:green:usb"; + label = "green:usb"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; led_status: status { - label = "mr-102n:amber:status"; + label = "amber:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan { - label = "mr-102n:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts index 1ba30c9152..f58a519b11 100644 --- a/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts +++ b/target/linux/ramips/dts/rt3052_aztech_hw550-3g.dts @@ -55,24 +55,24 @@ compatible = "gpio-leds"; usb { - label = "hw550-3g:green:usb"; + label = "green:usb"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; 3g { - label = "hw550-3g:green:3g"; + label = "green:3g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "hw550-3g:green:status"; + label = "green:status"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "hw550-3g:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts index faf1fe222e..a9db2882f3 100644 --- a/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts +++ b/target/linux/ramips/dts/rt3052_belkin_f5d8235-v2.dts @@ -59,49 +59,49 @@ compatible = "gpio-leds"; internet { - label = "f5d8235-v2:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; }; internet2 { - label = "f5d8235-v2:amber:internet"; + label = "amber:internet"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; modem { - label = "f5d8235-v2:blue:modem"; + label = "blue:modem"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; modem2 { - label = "f5d8235-v2:amber:modem"; + label = "amber:modem"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led_router: router { - label = "f5d8235-v2:blue:router"; + label = "blue:router"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; storage { - label = "f5d8235-v2:blue:storage"; + label = "blue:storage"; gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; storage2 { - label = "f5d8235-v2:amber:storage"; + label = "amber:storage"; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; security { - label = "f5d8235-v2:blue:security"; + label = "blue:security"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; security2 { - label = "f5d8235-v2:amber:security"; + label = "amber:security"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts index 73f03f8a44..ca6259d303 100644 --- a/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts +++ b/target/linux/ramips/dts/rt3052_buffalo_whr-g300n.dts @@ -60,17 +60,17 @@ compatible = "gpio-leds"; led_diag: diag { - label = "whr-g300n:red:diag"; + label = "red:diag"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; router { - label = "whr-g300n:green:router"; + label = "green:router"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; security { - label = "whr-g300n:amber:security"; + label = "amber:security"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts index 11c48e8e83..a2584e005e 100644 --- a/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts +++ b/target/linux/ramips/dts/rt3052_dlink_dap-1350.dts @@ -65,17 +65,17 @@ compatible = "gpio-leds"; led_power_blue: power { - label = "dap-1350:blue:power"; + label = "blue:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; power2 { - label = "dap-1350:red:power"; + label = "red:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "dap-1350:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts index 1f076eaab2..4566e7a166 100644 --- a/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts +++ b/target/linux/ramips/dts/rt3052_engenius_esr-9753.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_power: power { - label = "esr-9753:orange:power"; + label = "orange:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; wps { - label = "esr-9753:orange:wps"; + label = "orange:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts index 6f1ba34721..9d89c6e2f9 100644 --- a/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts +++ b/target/linux/ramips/dts/rt3052_fon_fonera-20n.dts @@ -55,17 +55,17 @@ compatible = "gpio-leds"; wifi { - label = "fonera-20n:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "fonera-20n:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; usb { - label = "fonera-20n:orange:usb"; + label = "orange:usb"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts index 55db04ff01..6734f5b336 100644 --- a/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts +++ b/target/linux/ramips/dts/rt3052_hauppauge_broadway.dts @@ -48,14 +48,14 @@ compatible = "gpio-leds"; diskmounted { - label = "broadway:red:diskmounted"; + label = "red:diskmounted"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; wps_active { - label = "broadway:red:wps_active"; + label = "red:wps_active"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts index 18894f6006..92ea59bc4c 100644 --- a/target/linux/ramips/dts/rt3052_huawei_hg255d.dts +++ b/target/linux/ramips/dts/rt3052_huawei_hg255d.dts @@ -61,34 +61,34 @@ compatible = "gpio-leds"; led_power: power { - label = "hg255d:green:power"; + label = "green:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; internet { - label = "hg255d:green:internet"; + label = "green:internet"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; wifi { - label = "hg255d:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; usb { - label = "hg255d:green:usb"; + label = "green:usb"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; wps { - label = "hg255d:green:wps"; + label = "green:wps"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; voice { - label = "hg255d:green:voice"; + label = "green:voice"; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts index 29ea1301f6..7b71af402f 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n825r.dts @@ -54,7 +54,7 @@ leds { compatible = "gpio-leds"; led_system: system { - label = "jhr-n825r:red:power"; + label = "red:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts index 05f20e3178..543144394f 100644 --- a/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts +++ b/target/linux/ramips/dts/rt3052_jcg_jhr-n926r.dts @@ -55,22 +55,22 @@ compatible = "gpio-leds"; wlan1 { - label = "jhr-n926r:red:wlan"; + label = "red:wlan"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; wlan2 { - label = "jhr-n926r:yellow:wlan"; + label = "yellow:wlan"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; wlan3 { - label = "jhr-n926r:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; led_system: system { - label = "jhr-n926r:blue:system"; + label = "blue:system"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts index 6f08f8257b..245f01c797 100644 --- a/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts +++ b/target/linux/ramips/dts/rt3052_mofinetwork_mofi3500-3gn.dts @@ -55,24 +55,24 @@ compatible = "gpio-leds"; usb { - label = "mofi3500-3gn:green:usb"; + label = "green:usb"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; 3g { - label = "mofi3500-3gn:green:3g"; + label = "green:3g"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_status: status { - label = "mofi3500-3gn:green:status"; + label = "green:status"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wps { - label = "mofi3500-3gn:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts index 5bac21c610..e5d70bd803 100644 --- a/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts +++ b/target/linux/ramips/dts/rt3052_netgear_wnce2001.dts @@ -22,22 +22,22 @@ compatible = "gpio-leds"; led_power_green: power-green { - label = "wnce2001:green:power"; + label = "green:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; power-red { - label = "wnce2001:red:power"; + label = "red:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan-green { - label = "wnce2001:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; }; wlan-red { - label = "wnce2001:red:wlan"; + label = "red:wlan"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts index 19f3fe680b..d3d5afe64b 100644 --- a/target/linux/ramips/dts/rt3052_nexaira_bc2.dts +++ b/target/linux/ramips/dts/rt3052_nexaira_bc2.dts @@ -48,7 +48,7 @@ compatible = "gpio-leds"; usb { - label = "bc2:blue:usb"; + label = "blue:usb"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts index f971bee991..bc3dd5ee56 100644 --- a/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts +++ b/target/linux/ramips/dts/rt3052_omnima_miniembwifi.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_status: status { - label = "miniembwifi:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan { - label = "miniembwifi:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts index fc65e0e9b6..b17097cb45 100644 --- a/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts +++ b/target/linux/ramips/dts/rt3052_petatel_psr-680w.dts @@ -59,7 +59,7 @@ compatible = "gpio-leds"; led_wan: wan { - label = "psr-680w:red:wan"; + label = "red:wan"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts index 38d81f1bc3..ff199f890b 100644 --- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts +++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts @@ -61,17 +61,17 @@ compatible = "gpio-leds"; led_power: power { - label = "mzk-w300nh2:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wlan { - label = "mzk-w300nh2:amber:wlan"; + label = "amber:wlan"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wps { - label = "mzk-w300nh2:amber:wps"; + label = "amber:wps"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_poray_ip2202.dts b/target/linux/ramips/dts/rt3052_poray_ip2202.dts index 9a3522174d..f3dab80073 100644 --- a/target/linux/ramips/dts/rt3052_poray_ip2202.dts +++ b/target/linux/ramips/dts/rt3052_poray_ip2202.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_run: run { - label = "ip2202:green:run"; + label = "green:run"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; net { - label = "ip2202:amber:net"; + label = "amber:net"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts index ee4fdd60c4..312007c68f 100644 --- a/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts +++ b/target/linux/ramips/dts/rt3052_prolink_pwh2004.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; wifi { - label = "pwh2004:red:wifi"; + label = "red:wifi"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "pwh2004:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts index b14e695222..2689febf7f 100644 --- a/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts +++ b/target/linux/ramips/dts/rt3052_ralink_v22rw-2x2.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_security: security { - label = "v22rw-2x2:green:security"; + label = "green:security"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; wps { - label = "v22rw-2x2:red:wps"; + label = "red:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts index e519f65df8..f4aa24ec5a 100644 --- a/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts +++ b/target/linux/ramips/dts/rt3052_sitecom_wl-351.dts @@ -55,17 +55,17 @@ compatible = "gpio-leds"; led_power: power { - label = "wl-351:amber:power"; + label = "amber:power"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; unpopulated { - label = "wl-351:amber:unpopulated"; + label = "amber:unpopulated"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; unpopulated2 { - label = "wl-351:blue:unpopulated"; + label = "blue:unpopulated"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts index c23824deee..89e6c9ed71 100644 --- a/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts +++ b/target/linux/ramips/dts/rt3052_skyline_sl-r7205.dts @@ -55,7 +55,7 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "sl-r7205:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts index 30beae8483..dcebe64af4 100644 --- a/target/linux/ramips/dts/rt3052_tenda_3g300m.dts +++ b/target/linux/ramips/dts/rt3052_tenda_3g300m.dts @@ -18,34 +18,34 @@ compatible = "gpio-leds"; 3grouter { - label = "3g300m:blue:3grouter"; + label = "blue:3grouter"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; led_ap: ap { - label = "3g300m:blue:ap"; + label = "blue:ap"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wisprouter { - label = "3g300m:blue:wisprouter"; + label = "blue:wisprouter"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wirelessrouter { - label = "3g300m:blue:wirelessrouter"; + label = "blue:wirelessrouter"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; 3g { - label = "3g300m:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; wpsreset { - label = "3g300m:blue:wpsreset"; + label = "blue:wpsreset"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts index f683015ea0..f6c1b2d2b5 100644 --- a/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts +++ b/target/linux/ramips/dts/rt3052_tenda_w306r-v2.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_sys: sys { - label = "w306r-v20:green:sys"; + label = "green:sys"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "w306r-v20:green:wps"; + label = "green:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi index f62c18b0e2..dad0da16d5 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi +++ b/target/linux/ramips/dts/rt3052_unbranded_wr512-3gn.dtsi @@ -17,27 +17,27 @@ compatible = "gpio-leds"; 3g { - label = "wr512-3gn:green:3g"; + label = "green:3g"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; gateway { - label = "wr512-3gn:green:gateway"; + label = "green:gateway"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; ap { - label = "wr512-3gn:green:ap"; + label = "green:ap"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "wr512-3gn:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; station { - label = "wr512-3gn:green:station"; + label = "green:station"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts index 88cec02756..d94da95029 100644 --- a/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts +++ b/target/linux/ramips/dts/rt3052_unbranded_xdx-rn502j.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; wifi { - label = "xdxrn502j:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "xdxrn502j:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts index 509094d9b6..fc71437b48 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-326n4g.dts @@ -55,27 +55,27 @@ compatible = "gpio-leds"; 3g { - label = "ur-326n4g:green:3g"; + label = "green:3g"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; gateway { - label = "ur-326n4g:green:gateway"; + label = "green:gateway"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; ap { - label = "ur-326n4g:green:ap"; + label = "green:ap"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "ur-326n4g:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; station { - label = "ur-326n4g:green:station"; + label = "green:station"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts index 6c6461dcd6..2c00ca8945 100644 --- a/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts +++ b/target/linux/ramips/dts/rt3052_upvel_ur-336un.dts @@ -55,27 +55,27 @@ compatible = "gpio-leds"; 3g { - label = "ur-336un:green:3g"; + label = "green:3g"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; gateway { - label = "ur-336un:green:gateway"; + label = "green:gateway"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; ap { - label = "ur-336un:green:ap"; + label = "green:ap"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "ur-336un:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; station { - label = "ur-336un:green:station"; + label = "green:station"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts index 556e703cc4..6c65d34f16 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_keenetic.dts @@ -55,19 +55,19 @@ compatible = "gpio-leds"; led_power: power { - label = "kn:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; usb { - label = "kn:green:usb"; + label = "green:usb"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; trigger-sources = <&otg_port1>; linux,default-trigger = "usbport"; }; wps { - label = "kn:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts index 5da800cb38..db4f8d4a31 100644 --- a/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts +++ b/target/linux/ramips/dts/rt3052_zyxel_nbg-419n.dts @@ -55,12 +55,12 @@ compatible = "gpio-leds"; led_power: power { - label = "nbg-419n:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "nbg-419n:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3352_allnet_all5002.dts b/target/linux/ramips/dts/rt3352_allnet_all5002.dts index b59d3f0012..b5bdd3cd81 100644 --- a/target/linux/ramips/dts/rt3352_allnet_all5002.dts +++ b/target/linux/ramips/dts/rt3352_allnet_all5002.dts @@ -32,12 +32,12 @@ compatible = "gpio-leds"; ld1 { - label = "all5002:green:ld1"; + label = "green:ld1"; gpios = <&pcf0 0 GPIO_ACTIVE_LOW>; }; ld2 { - label = "all5002:green:ld2"; + label = "green:ld2"; gpios = <&pcf0 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts index 727ba6b7ea..2233c9018c 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-615-h1.dts @@ -19,28 +19,28 @@ compatible = "gpio-leds"; status { - label = "dir-615-h1:amber:status"; + label = "amber:status"; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; }; led_status_green: status2 { - label = "dir-615-h1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; default-state = "on"; }; wan { - label = "dir-615-h1:amber:wan"; + label = "amber:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; wan2 { - label = "dir-615-h1:green:wan"; + label = "green:wan"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-615-h1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts index 36125ef5c9..50b762ce5a 100644 --- a/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts +++ b/target/linux/ramips/dts/rt3352_dlink_dir-620-d1.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_status: status { - label = "dir-620-d1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wifi { - label = "dir-620-d1:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts index 0c71410cbb..84bb645c5a 100644 --- a/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts +++ b/target/linux/ramips/dts/rt3352_zyxel_nbg-419n-v2.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; led_power: power { - label = "nbg-419n2:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "nbg-419n2:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; usb { - label = "nbg-419n2:green:usb"; + label = "green:usb"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts index ca3da99b19..98426b86f0 100644 --- a/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts +++ b/target/linux/ramips/dts/rt3662_asus_rt-n56u.dts @@ -78,22 +78,22 @@ compatible = "gpio-leds"; led_power: power { - label = "rt-n56u:blue:power"; + label = "blue:power"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; lan { - label = "rt-n56u:blue:lan"; + label = "blue:lan"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; wan { - label = "rt-n56u:blue:wan"; + label = "blue:wan"; gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; usb { - label = "rt-n56u:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts index 451576eed9..778ee3c1e7 100644 --- a/target/linux/ramips/dts/rt3662_dlink_dir-645.dts +++ b/target/linux/ramips/dts/rt3662_dlink_dir-645.dts @@ -42,12 +42,12 @@ compatible = "gpio-leds"; inet { - label = "dir-645:green:inet"; + label = "green:inet"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; led_wps: wps { - label = "dir-645:green:wps"; + label = "green:wps"; gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts index 85c98599e2..c0e3193818 100644 --- a/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts +++ b/target/linux/ramips/dts/rt3662_edimax_br-6475nd.dts @@ -36,17 +36,17 @@ compatible = "gpio-leds"; led_power: power { - label = "br-6475nd:green:power"; + label = "green:power"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; wlan { - label = "br-6475nd:amber:wlan"; + label = "amber:wlan"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; wlan_5ghz { - label = "br-6475nd:amber:wlan_5ghz"; + label = "amber:wlan_5ghz"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3662_omnima_hpm.dts b/target/linux/ramips/dts/rt3662_omnima_hpm.dts index c542079e21..c0f30ec6c7 100644 --- a/target/linux/ramips/dts/rt3662_omnima_hpm.dts +++ b/target/linux/ramips/dts/rt3662_omnima_hpm.dts @@ -33,34 +33,34 @@ compatible = "gpio-leds"; power { - label = "hpm:orange:power"; + label = "orange:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; default-state = "on"; }; led_status: status { - label = "hpm:green:status"; + label = "green:status"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; default-state = "on"; }; eth { - label = "hpm:green:eth"; + label = "green:eth"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; eth2 { - label = "hpm:red:eth"; + label = "red:eth"; gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; }; wifi { - label = "hpm:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; wifi2 { - label = "hpm:red:wifi"; + label = "red:wifi"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts index bd14699de5..ad417856b3 100644 --- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts +++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts @@ -89,19 +89,19 @@ compatible = "gpio-leds"; wps { - label = "cy-swr1100:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; usb { - label = "cy-swr1100:blue:usb"; + label = "blue:usb"; gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; led_power: power { - label = "cy-swr1100:blue:power"; + label = "blue:power"; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts index 6705486b1f..78c9bb4b6d 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts +++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts @@ -17,36 +17,36 @@ compatible = "gpio-leds"; led_status_amber: internet_amber { - label = "f9k1109v1:amber:internet"; + label = "amber:internet"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; led_status_blue: internet_blue { - label = "f9k1109v1:blue:internet"; + label = "blue:internet"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; usb1 { - label = "f9k1109v1:green:usb1"; + label = "green:usb1"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; usb2 { - label = "f9k1109v1:green:usb2"; + label = "green:usb2"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port2>, <&ehci_port2>; linux,default-trigger = "usbport"; }; wps_amber { - label = "f9k1109v1:amber:wps"; + label = "amber:wps"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; wps_blue { - label = "f9k1109v1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts index ffa99b5946..ccf9917dac 100644 --- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts +++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts @@ -29,12 +29,12 @@ compatible = "gpio-leds"; led_power: power { - label = "wlr-6000:red:power"; + label = "red:power"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; ops { - label = "wlr-6000:white:ops"; + label = "white:ops"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts index 855d908c8c..03e504a6d1 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts @@ -77,7 +77,7 @@ compatible = "gpio-leds"; led_wps: wps { - label = "tew-691gr:green:wps"; + label = "green:wps"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts index 1f85242b7b..95a2bb75f3 100644 --- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts +++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts @@ -71,12 +71,12 @@ compatible = "gpio-leds"; wps { - label = "tew-692gr:orange:wps"; + label = "orange:wps"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; led_wps_green: wps2 { - label = "tew-692gr:green:wps"; + label = "green:wps"; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi index a4a520cdcb..a15d140f3e 100644 --- a/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi +++ b/target/linux/ramips/dts/rt5350_7links_px-4885.dtsi @@ -28,12 +28,12 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "px-4885:orange:wifi"; + label = "orange:wifi"; gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; }; storage { - label = "px-4885:blue:storage"; + label = "blue:storage"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts index f68694b924..edd347b6e0 100644 --- a/target/linux/ramips/dts/rt5350_airlive_air3gii.dts +++ b/target/linux/ramips/dts/rt5350_airlive_air3gii.dts @@ -11,12 +11,12 @@ compatible = "gpio-leds"; wlan { - label = "air3gii:green:wlan"; + label = "green:wlan"; gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; mobile { - label = "air3gii:green:mobile"; + label = "green:mobile"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts index 818e64834b..4c3d441847 100644 --- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts +++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts @@ -32,12 +32,12 @@ compatible = "gpio-leds"; ld1 { - label = "all5003:green:ld1"; + label = "green:ld1"; gpios = <&pcf0 0 GPIO_ACTIVE_LOW>; }; ld2 { - label = "all5003:green:ld2"; + label = "green:ld2"; gpios = <&pcf0 1 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index 840db54670..07e088652c 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -10,17 +10,17 @@ compatible = "gpio-leds"; tx { - label = "awm002-evb:green:tx"; + label = "green:tx"; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; }; rx { - label = "awm002-evb:green:rx"; + label = "green:rx"; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; wps { - label = "awm002-evb:green:wps"; + label = "green:wps"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts index fd73038dc2..e3691b75bd 100644 --- a/target/linux/ramips/dts/rt5350_belkin_f7c027.dts +++ b/target/linux/ramips/dts/rt5350_belkin_f7c027.dts @@ -18,22 +18,22 @@ compatible = "gpio-leds"; status { - label = "f7c027:blue:status"; + label = "blue:status"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; power { - label = "f7c027:blue:power"; + label = "blue:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; led_status_orange: orange { - label = "f7c027:orange:status"; + label = "orange:status"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; relay { - label = "f7c027:device:relay"; + label = "device:relay"; gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index 83f63f8727..fcff567885 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_power: power { - label = "dcs-930l-b1:red:power"; + label = "red:power"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; wps { - label = "dcs-930l-b1:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts index 17fecfba1b..bcc02f3cda 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-300-b7.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_status: status { - label = "dir-300-b7:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-300-b7:blue:wps"; + label = "blue:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index f530f418aa..bc3e431982 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -18,17 +18,17 @@ compatible = "gpio-leds"; led_status: status { - label = "dir-320-b1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; usb { - label = "dir-320-b1:green:usb"; + label = "green:usb"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-320-b1:green:wps"; + label = "green:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts index bb9950a5f0..5bd87190a5 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-610-a1.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_status: status { - label = "dir-610-a1:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "dir-610-a1:green:wps"; + label = "green:wps"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts index 9bea682b43..48fb1d4ffd 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts @@ -35,27 +35,27 @@ compatible = "gpio-leds"; sms { - label = "dwr-512-b:green:sms"; + label = "green:sms"; gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; led_status: status { - label = "dwr-512-b:green:status"; + label = "green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; 2g { - label = "dwr-512-b:green:2g"; + label = "green:2g"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; 3g { - label = "dwr-512-b:green:3g"; + label = "green:3g"; gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; }; sstrengthr { - label = "dwr-512-b:red:sigstrength"; + label = "red:sigstrength"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; sstrengthg { - label = "dwr-512-b:green:sigstrength"; + label = "green:sigstrength"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index ad169f6729..2635134348 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_system: system { - label = "mpr-a1:blue:system"; + label = "blue:system"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; power { - label = "mpr-a1:red:power"; + label = "red:power"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index 3c17bb6310..500f6ebd01 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_system: system { - label = "mpr-a2:blue:system"; + label = "blue:system"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; power { - label = "mpr-a2:red:power"; + label = "red:power"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index dc6fab8c14..a4c8c83f82 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_wlan: wlan { - label = "ht-tm02:blue:wlan"; + label = "blue:wlan"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; lan { - label = "ht-tm02:green:lan"; + label = "green:lan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 14a1a78268..769aec6a50 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -22,12 +22,12 @@ compatible = "gpio-leds"; led_wifi: wifi { - label = "memory2move:blue:wifi"; + label = "blue:wifi"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; wan { - label = "memory2move:green:wan"; + label = "green:wan"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index 24e7cdbc87..102132628e 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -11,12 +11,12 @@ compatible = "gpio-leds"; wlan { - label = "miniembplug:red:wlan"; + label = "red:wlan"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; }; mobile { - label = "miniembplug:green:mobile"; + label = "green:mobile"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts index f683a05efb..c7e899580c 100644 --- a/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts +++ b/target/linux/ramips/dts/rt5350_planex_mzk-dp150n.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "mzk-dp150n:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 3b7f34cf49..1fc4959639 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_status: status { - label = "m3:blue:status"; + label = "blue:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index 2413de2889..c4ca6ab6cd 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -17,7 +17,7 @@ compatible = "gpio-leds"; led_status: status { - label = "m4:blue:status"; + label = "blue:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index dbbf59a923..bbc1c14e65 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -18,22 +18,22 @@ compatible = "gpio-leds"; led_power: power { - label = "x5:green:power"; + label = "green:power"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; 20 { - label = "x5:green:20"; + label = "green:20"; gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; 50 { - label = "x5:green:50"; + label = "green:50"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; 80 { - label = "x5:green:80"; + label = "green:80"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index 1ba0a77a4f..b36dd46f57 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -18,7 +18,7 @@ compatible = "gpio-leds"; led_power: power { - label = "x8:green:power"; + label = "green:power"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index affa5b4cfc..9bfa793646 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; led_ap: ap { - label = "3g150b:blue:ap"; + label = "blue:ap"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; }; 3g { - label = "3g150b:blue:3g"; + label = "blue:3g"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index fdd72f354d..11765f10c6 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -11,14 +11,14 @@ compatible = "gpio-leds"; usb { - label = "tew-714tru:red:usb"; + label = "red:usb"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; trigger-sources = <&ohci_port1>, <&ehci_port1>; linux,default-trigger = "usbport"; }; wifi { - label = "tew-714tru:green:wifi"; + label = "green:wifi"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index 7f07b3f431..42e6dcfb4e 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -19,12 +19,12 @@ compatible = "gpio-leds"; system { - label = "a5-v11:blue:system"; + label = "blue:system"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; led_power: power { - label = "a5-v11:red:power"; + label = "red:power"; gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index 791b69448a..a905e023cb 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -144,13 +144,13 @@ led_status: status { /* UARTF_RXD */ - label = "vocore:green:status"; + label = "green:status"; gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; }; eth { /* UARTF_DTR_N */ - label = "vocore:orange:eth"; + label = "orange:eth"; gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index 0ed1de286b..9a2c0a606c 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -22,22 +22,22 @@ compatible = "gpio-leds"; led_run: run { - label = "wizfi630a::run"; + label = ":run"; gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; wps { - label = "wizfi630a::wps"; + label = ":wps"; gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; }; uart1 { - label = "wizfi630a::uart1"; + label = ":uart1"; gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; }; uart2 { - label = "wizfi630a::uart2"; + label = ":uart2"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts index 04b2ce7408..0879c11206 100644 --- a/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts +++ b/target/linux/ramips/dts/rt5350_zorlik_zl5900v2.dts @@ -18,12 +18,12 @@ compatible = "gpio-leds"; lan { - label = "zl5900v2:green:lan"; + label = "green:lan"; gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; }; led_power: power { - label = "zl5900v2:blue:power"; + label = "blue:power"; gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts index ad5b07f886..bc16e2c5c1 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-lite-b.dts @@ -20,12 +20,12 @@ compatible = "gpio-leds"; led_power: power { - label = "keenetic-lite-b:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; wps { - label = "keenetic-lite-b:green:wps"; + label = "green:wps"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts index e5e2ac998a..eb7d7ed46b 100644 --- a/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts +++ b/target/linux/ramips/dts/rt5350_zyxel_keenetic-start.dts @@ -21,12 +21,12 @@ compatible = "gpio-leds"; led_power: power { - label = "zyxel:green:power"; + label = "green:power"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; }; internet { - label = "zyxel:green:internet"; + label = "green:internet"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; }; diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds index ec86ed4b3f..292f310d51 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds @@ -3,235 +3,221 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in aigale,ai-br100) - ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" "eth0.2" - set_wifi_led "$boardname:blue:wlan" + ucidef_set_led_netdev "wan" "wan" "blue:wan" "eth0.2" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wlan" "wlan0" ;; alfa-network,ac1200rm) - set_wifi_led "$boardname:green:wlan2g" "wlan1" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan2g" "wlan1" ;; alfa-network,r36m-e4g) - ucidef_set_led_netdev "4g" "4g" "$boardname:orange:4g" "wwan0" - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x8" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_netdev "4g" "4g" "orange:4g" "wwan0" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x8" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; alfa-network,tube-e4g) - ucidef_set_led_netdev "4g" "4g" "$boardname:green:4g" "wwan0" - ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" "eth0" + ucidef_set_led_netdev "4g" "4g" "green:4g" "wwan0" + ucidef_set_led_netdev "lan" "lan" "blue:lan" "eth0" ;; asus,rp-n53) - ucidef_set_led_netdev "eth" "Network" "$boardname:white:back" "eth0" - set_wifi_led "$boardname:blue:wifi" + ucidef_set_led_netdev "eth" "Network" "white:back" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" ;; asus,rt-n12p) - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0.1 - ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2 - set_wifi_led "$boardname:green:air" + ucidef_set_led_netdev "lan" "lan" "green:lan" eth0.1 + ucidef_set_led_netdev "wan" "wan" "green:wan" eth0.2 + ucidef_set_led_netdev "wifi_led" "wifi" "green:air" "wlan0" ;; asus,rt-n14u) - ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" eth0.1 - ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2 - set_wifi_led "$boardname:blue:air" + ucidef_set_led_netdev "lan" "lan" "blue:lan" eth0.1 + ucidef_set_led_netdev "wan" "wan" "blue:wan" eth0.2 + ucidef_set_led_netdev "wifi_led" "wifi" "blue:air" "wlan0" ;; bdcom,wap2100-sk) - set_wifi_led "$boardname:green:wlan2g" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan2g" "wlan0" ;; comfast,cf-wr800n) - ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1 - set_wifi_led "$boardname:white:wifi" + ucidef_set_led_netdev "lan" "lan" "white:ethernet" eth0.1 + ucidef_set_led_netdev "wifi_led" "wifi" "white:wifi" "wlan0" ;; dlink,dir-810l|\ trendnet,tew-810dr) - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; dlink,dwr-116-a1|\ head-weblink,hdrm200|\ ohyeah,oy-0001|\ planex,mzk-ex300np|\ +zbtlink,zbt-we826-16m|\ +zbtlink,zbt-we826-32m|\ zbtlink,zbt-wr8305rt|\ zyxel,keenetic-omni|\ zyxel,keenetic-omni-ii|\ zyxel,keenetic-viva) - set_wifi_led "$boardname:green:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; dlink,dwr-118-a1) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1f" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x20" - set_wifi_led "$boardname:green:wlan2g" "wlan1" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1f" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x20" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan2g" "wlan1" ;; dlink,dwr-118-a2) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" - set_wifi_led "$boardname:green:wlan2g" "wlan1" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan2g" "wlan1" ;; dlink,dwr-921-c1|\ dlink,dwr-922-e2) - set_wifi_led "$boardname:green:wifi" - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f" - ucidef_set_led_netdev "signalstrength" "signalstrength" "$boardname:green:sigstrength" "wwan0" "link" - ucidef_set_led_netdev "4g" "4g" "$boardname:green:4g" "wwan0" "tx rx" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x0f" + ucidef_set_led_netdev "signalstrength" "signalstrength" "green:sigstrength" "wwan0" "link" + ucidef_set_led_netdev "4g" "4g" "green:4g" "wwan0" "tx rx" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; dlink,dwr-960) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x2e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x2e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ;; dovado,tiny-ac) - set_wifi_led "$boardname:orange:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "orange:wifi" "wlan0" ;; edimax,br-6478ac-v2|\ edimax,ew-7478apc) - set_wifi_led "$boardname:blue:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wlan" "wlan0" ;; edimax,ew-7476rpc|\ edimax,ew-7478ac) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x20" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x20" ;; elecom,wrh-300cr) - set_wifi_led "$boardname:green:wlan" - ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0" + ucidef_set_led_netdev "lan" "lan" "green:ethernet" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; engenius,esr600) - ucidef_set_led_netdev "wlan5g" "5.0GHz" "$boardname:blue:wlan5g" "wlan0" - ucidef_set_led_netdev "wlan2g" "2.4GHz" "$boardname:blue:wlan2g" "wlan1" + ucidef_set_led_netdev "wlan5g" "5.0GHz" "blue:wlan5g" "wlan0" + ucidef_set_led_netdev "wlan2g" "2.4GHz" "blue:wlan2g" "wlan1" ;; glinet,gl-mt300a|\ glinet,gl-mt300n|\ glinet,gl-mt750) - set_wifi_led "$boardname:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "wlan" "wlan0" ;; hiwifi,hc5661|\ hiwifi,hc5761) - ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x01" + ucidef_set_led_switch "internet" "internet" "blue:internet" "switch0" "0x01" ;; hiwifi,hc5861) - ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x20" + ucidef_set_led_switch "internet" "internet" "blue:internet" "switch0" "0x20" ;; hnet,c108) - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" - ucidef_set_led_netdev "modem" "modem" "$boardname:green:modem" "wwan0" + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0" + ucidef_set_led_netdev "modem" "modem" "green:modem" "wwan0" ;; iodata,wn-ac1167gr|\ iodata,wn-ac733gr3) - ucidef_set_led_wlan "wlan5g" "WLAN5G" "$boardname:green:wlan5g" "phy0radio" - ucidef_set_led_wlan "wlan2g" "WLAN2G" "$boardname:green:wlan2g" "phy1radio" + ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy0radio" + ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy1radio" ;; kimax,u25awf-h1) - set_wifi_led "u25awf:red:wifi" - ucidef_set_led_netdev "eth" "eth" "u25awf:green:lan" "eth0" + ucidef_set_led_netdev "eth" "eth" "green:lan" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wifi" "wlan0" ;; kimax,u35wf) - set_wifi_led "$boardname:blue:wifi" - ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0" + ucidef_set_led_netdev "eth" "ETH" "green:eth" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" ;; kingston,mlw221|\ kingston,mlwg2|\ sanlinking,d240) - set_wifi_led "$boardname:blue:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" ;; lava,lr-25g001) - ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:green:wlan2g" "wlan1" - ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:green:wlan5g" "wlan0" + ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "green:wlan2g" "wlan1" + ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "green:wlan5g" "wlan0" ;; lenovo,newifi-y1) - ucidef_set_led_netdev "wifi" "WIFI" "$boardname:blue:wifi" "wlan1" - ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi5g" "wlan0" - ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x03" + ucidef_set_led_netdev "wifi" "WIFI" "blue:wifi" "wlan1" + ucidef_set_led_netdev "wifi5g" "WIFI5G" "blue:wifi5g" "wlan0" + ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x03" ;; lenovo,newifi-y1s) - ucidef_set_led_netdev "wifi" "WIFI" "$boardname:yellow:wifi" "wlan1" - ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi" "wlan0" - ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:internet" "eth0.2" "tx rx" + ucidef_set_led_netdev "wifi" "WIFI" "yellow:wifi" "wlan1" + ucidef_set_led_netdev "wifi5g" "WIFI5G" "blue:wifi" "wlan0" + ucidef_set_led_netdev "wan" "WAN" "blue:internet" "eth0.2" "tx rx" ;; netgear,ex2700|\ netgear,wn3000rp-v3) - set_wifi_led "$boardname:green:router" + ucidef_set_led_netdev "wifi_led" "wifi" "green:router" "wlan0" ;; netgear,ex3700|\ netgear,ex6130) - ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0" - ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1" + ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "green:router" "wlan0" + ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "green:device" "wlan1" ;; netgear,jwnr2010-v5) - ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x08" - ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x04" - ucidef_set_led_switch "lan3" "lan3" "$boardname:green:lan3" "switch0" "0x02" - ucidef_set_led_switch "lan4" "lan4" "$boardname:green:lan4" "switch0" "0x01" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_switch "lan1" "lan1" "green:lan1" "switch0" "0x08" + ucidef_set_led_switch "lan2" "lan2" "green:lan2" "switch0" "0x04" + ucidef_set_led_switch "lan3" "lan3" "green:lan3" "switch0" "0x02" + ucidef_set_led_switch "lan4" "lan4" "green:lan4" "switch0" "0x01" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; phicomm,psg1208) - set_wifi_led "$boardname:white:wlan2g" + ucidef_set_led_netdev "wifi_led" "wifi" "white:wlan2g" "wlan0" ;; planex,mzk-ex750np|\ zbtlink,zbt-we826-e) - set_wifi_led "$boardname:red:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wifi" "wlan0" ;; ravpower,rp-wd03) - ucidef_set_led_netdev "internet" "internet" "$boardname:green:wifi" "eth0" + ucidef_set_led_netdev "internet" "internet" "green:wifi" "eth0" ;; tplink,archer-c2-v1) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch1" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch1" "0x01" - ;; -tplink,archer-c20-v1) - ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch1" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch1" "0x01" ;; +tplink,archer-c20-v1|\ tplink,archer-c20i) - ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01" + ucidef_set_led_switch "lan" "lan" "blue:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "blue:wan" "switch0" "0x01" ;; tplink,archer-c50-v1) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ;; tplink,archer-mr200) - ucidef_set_led_netdev "lan" "lan" "$boardname:white:lan" "eth0.1" - ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "usb0" + ucidef_set_led_netdev "lan" "lan" "white:lan" "eth0.1" + ucidef_set_led_netdev "wan" "wan" "white:wan" "usb0" ;; tplink,re200-v1) - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0" ;; youku,yk1) - set_wifi_led "$boardname:blue:air" - ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "blue:wan" "switch0" "0x10" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:air" "wlan0" ;; zbtlink,zbt-ape522ii) - ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1" - ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx" - ucidef_set_led_netdev "sys2" "wlan0" "$boardname:green:sys2" "wlan0" "tx rx" + ucidef_set_led_netdev "wlan2g4" "wlan1-link" "green:wlan2g4" "wlan1" + ucidef_set_led_netdev "sys1" "wlan1" "green:sys1" "wlan1" "tx rx" + ucidef_set_led_netdev "sys2" "wlan0" "green:sys2" "wlan0" "tx rx" ;; zbtlink,zbt-wa05) - set_wifi_led "$boardname:blue:air" - ;; -zbtlink,zbt-we826-16m|\ -zbtlink,zbt-we826-32m) - set_wifi_led "zbt-we826:green:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:air" "wlan0" ;; zbtlink,zbt-we1026-5g-16m) - ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0" - set_wifi_led "we1026-5g:green:wifi" + ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; zbtlink,zbt-we1026-h-32m) - set_wifi_led "we1026-h:green:wifi" - ucidef_set_led_switch "lan" "lan" "we1026-h:green:lan" "switch0" "0x8" - ucidef_set_led_switch "wan" "wan" "we1026-h:green:wan" "switch0" "0x10" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x8" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; zbtlink,zbt-we2026) - set_wifi_led "$boardname:green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; esac diff --git a/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration deleted file mode 100644 index 0f2e08cf7f..0000000000 --- a/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration +++ /dev/null @@ -1,50 +0,0 @@ -. /lib/functions.sh -. /lib/functions/migrations.sh - -board=$(board_name) - -case "$board" in -lenovo,newifi-y1) - migrate_leds "^y1:=newifi-y1:" - ;; -lenovo,newifi-y1s) - migrate_leds "^y1s:=newifi-y1s:" - ;; -netgear,wn3000rp-v3) - migrate_leds "^wn3000rpv3:=wn3000rp-v3:" - ;; -ravpower,rp-wd03) - migrate_leds "^wd03:=rp-wd03:" - ;; -tplink,archer-c2-v1) - migrate_leds "^c2-v1:=archer-c2-v1:" - ;; -tplink,archer-c20-v1) - migrate_leds "^c20-v1:=archer-c20-v1:" - ;; -tplink,archer-c20i) - migrate_leds "^c20i:=archer-c20i:" - ;; -tplink,archer-c50-v1) - migrate_leds "^c50:=archer-c50-v1:" - ;; -tplink,archer-mr200) - migrate_leds "^mr200:=archer-mr200:" - ;; -youku,yk1) - migrate_leds "^youku-yk1:=yk1:" - ;; -zyxel,keenetic-omni) - migrate_leds "^kn_rc:=keenetic-omni:" - ;; -zyxel,keenetic-omni-ii) - migrate_leds "^kn_rc:=keenetic-omni-ii:" - ;; -zyxel,keenetic-viva) - migrate_leds "^kng_rc:=keenetic-viva:" - ;; -esac - -migrations_apply system - -exit 0 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index bbca3c8ff5..41120a464d 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -3,66 +3,58 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in d-team,newifi-d2) - ucidef_set_led_netdev "internet" "internet" "$boardname:amber:internet" "wan" - ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:blue:wlan2g" "ra0" - ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:blue:wlan5g" "rai0" + ucidef_set_led_netdev "internet" "internet" "amber:internet" "wan" + ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "blue:wlan2g" "ra0" + ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "blue:wlan5g" "rai0" ;; d-team,pbr-m1|\ -gehua,ghl-r-001) - ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "wan" +gehua,ghl-r-001|\ +xzwifi,creativebox-v1) + ucidef_set_led_netdev "internet" "internet" "blue:internet" "wan" ;; dlink,dir-1960-a1|\ dlink,dir-2660-a1) - ucidef_set_led_netdev "wan" "wan" "$boardname:white:net" "wan" + ucidef_set_led_netdev "wan" "wan" "white:net" "wan" ;; dlink,dir-860l-b1|\ dlink,dir-867-a1|\ dlink,dir-878-a1|\ dlink,dir-882-a1) - ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "wan" + ucidef_set_led_netdev "wan" "wan" "green:net" "wan" ;; gnubee,gb-pc1|\ gnubee,gb-pc2) - ucidef_set_led_netdev "lan1" "lan1" "$boardname:green:lan1" "lan1" - ucidef_set_led_netdev "lan2" "lan2" "$boardname:green:lan2" "lan2" + ucidef_set_led_netdev "lan1" "lan1" "green:lan1" "lan1" + ucidef_set_led_netdev "lan2" "lan2" "green:lan2" "lan2" ;; linksys,ea7300-v1|\ linksys,ea7300-v2|\ linksys,ea7500-v2) - ucidef_set_led_netdev "lan1" "lan1 link" "$boardname:green:lan1" "lan1" "link" - ucidef_set_led_netdev "lan2" "lan2 link" "$boardname:green:lan2" "lan2" "link" - ucidef_set_led_netdev "lan3" "lan3 link" "$boardname:green:lan3" "lan3" "link" - ucidef_set_led_netdev "lan4" "lan4 link" "$boardname:green:lan4" "lan4" "link" - ucidef_set_led_netdev "wan" "wan link" "$boardname:green:wan" "wan" "link" + ucidef_set_led_netdev "lan1" "lan1 link" "green:lan1" "lan1" "link" + ucidef_set_led_netdev "lan2" "lan2 link" "green:lan2" "lan2" "link" + ucidef_set_led_netdev "lan3" "lan3 link" "green:lan3" "lan3" "link" + ucidef_set_led_netdev "lan4" "lan4 link" "green:lan4" "lan4" "link" + ucidef_set_led_netdev "wan" "wan link" "green:wan" "wan" "link" ;; mikrotik,routerboard-760igs) - ucidef_set_led_netdev "sfp" "SFP" "$boardname:blue:sfp" "sfp" + ucidef_set_led_netdev "sfp" "SFP" "blue:sfp" "sfp" ;; mikrotik,routerboard-m11g) 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 "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssi2" "wlan0" "40" "100" - ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssi3" "wlan0" "60" "100" - ucidef_set_led_rssi "rssiveryhigh" "RSSIVERYHIGH" "$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 "rssimediumhigh" "RSSIMEDIUMHIGH" "green:rssi2" "wlan0" "40" "100" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssi3" "wlan0" "60" "100" + ucidef_set_led_rssi "rssiveryhigh" "RSSIVERYHIGH" "green:rssi4" "wlan0" "80" "100" ;; mtc,wr1201) - ucidef_set_led_netdev "eth_link" "LAN link" "$boardname:green:eth_link" "br-lan" + ucidef_set_led_netdev "eth_link" "LAN link" "green:eth_link" "br-lan" ;; netgear,r6220|\ netgear,r6260|\ @@ -70,38 +62,35 @@ netgear,r6350|\ netgear,r6850|\ netgear,wac124|\ netgear,wndr3700-v5) - ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" "wan" + ucidef_set_led_netdev "wan" "wan" "green:wan" "wan" ;; netgear,r6700-v2|\ netgear,r6800) - ucidef_set_led_netdev "wan" "WAN" "$boardname:white:wan" "wan" - ucidef_set_led_netdev "lan1" "LAN1" "$boardname:white:lan1" "lan1" - ucidef_set_led_netdev "lan2" "LAN2" "$boardname:white:lan2" "lan2" - ucidef_set_led_netdev "lan3" "LAN3" "$boardname:white:lan3" "lan3" - ucidef_set_led_netdev "lan4" "LAN4" "$boardname:white:lan4" "lan4" + ucidef_set_led_netdev "wan" "WAN" "white:wan" "wan" + ucidef_set_led_netdev "lan1" "LAN1" "white:lan1" "lan1" + ucidef_set_led_netdev "lan2" "LAN2" "white:lan2" "lan2" + ucidef_set_led_netdev "lan3" "LAN3" "white:lan3" "lan3" + ucidef_set_led_netdev "lan4" "LAN4" "white:lan4" "lan4" ;; tplink,re350-v1) - ucidef_set_led_netdev "wifi2g" "Wifi 2.4G" "$boardname:blue:wifi2G" "wlan0" - ucidef_set_led_netdev "wifi5g" "Wifi 5G" "$boardname:blue:wifi5G" "wlan1" - ucidef_set_led_netdev "eth_act" "LAN act" "$boardname:green:eth_act" "lan" "tx rx" - ucidef_set_led_netdev "eth_link" "LAN link" "$boardname:green:eth_link" "lan" "link" + ucidef_set_led_netdev "wifi2g" "Wifi 2.4G" "blue:wifi2G" "wlan0" + ucidef_set_led_netdev "wifi5g" "Wifi 5G" "blue:wifi5G" "wlan1" + ucidef_set_led_netdev "eth_act" "LAN act" "green:eth_act" "lan" "tx rx" + ucidef_set_led_netdev "eth_link" "LAN link" "green:eth_link" "lan" "link" ;; tplink,re500-v1|\ tplink,re650-v1) - ucidef_set_led_netdev "eth_act" "LAN act" "$boardname:green:eth_act" "lan" "tx rx" - ucidef_set_led_netdev "eth_link" "LAN link" "$boardname:green:eth_link" "lan" "link" - ;; -xzwifi,creativebox-v1) - ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "wan" + ucidef_set_led_netdev "eth_act" "LAN act" "green:eth_act" "lan" "tx rx" + ucidef_set_led_netdev "eth_link" "LAN link" "green:eth_link" "lan" "link" ;; xiaomi,mi-router-ac2100) - ucidef_set_led_netdev "wan-blue" "WAN (blue)" "$boardname:blue:wan" "wan" + ucidef_set_led_netdev "wan-blue" "WAN (blue)" "blue:wan" "wan" ;; xiaomi,redmi-router-ac2100) - ucidef_set_led_netdev "wan" "wan" "$boardname:white:wan" "wan" + ucidef_set_led_netdev "wan" "wan" "white:wan" "wan" ;; youhua,wr1200js) - ucidef_set_led_netdev "internet" "INTERNET" "$boardname:green:wan" "wan" + ucidef_set_led_netdev "internet" "INTERNET" "green:wan" "wan" ;; esac diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration deleted file mode 100644 index 4b298654b6..0000000000 --- a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration +++ /dev/null @@ -1,27 +0,0 @@ -. /lib/functions.sh -. /lib/functions/migrations.sh - -board=$(board_name) -boardonly="${board##*,}" - -case "$board" in -asus,rt-ac65p) - migrate_leds "^rt-ac85p:=rt-ac65p:" - ;; -mikrotik,routerboard-750gr3) - migrate_leds "^rb750gr3:=$boardonly:" - ;; -mikrotik,routerboard-m11g) - migrate_leds "^rbm11g:=$boardonly:" - ;; -mikrotik,routerboard-m33g) - migrate_leds "^rbm33g:=$boardonly:" - ;; -netgear,wndr3700-v5) - migrate_leds "^wndr3700v5:=$boardonly:" - ;; -esac - -migrations_apply system - -exit 0 diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds index 52be48e1ef..c26d6436e9 100755 --- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds @@ -3,22 +3,13 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in alfa-network,awusfree1) - set_wifi_led "$boardname:blue:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wlan" "wlan0" ;; asus,rt-n10p-v3|\ asus,rt-n11p-b1|\ @@ -26,119 +17,116 @@ asus,rt-n12-vp-b1|\ netgear,r6020|\ netgear,r6080|\ netgear,r6120) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0xf" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0xf" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; cudy,wr1000) - ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10" - ucidef_set_led_switch "lan1" "lan1" "$boardname:blue:lan1" "switch0" "0x08" - ucidef_set_led_switch "lan2" "lan2" "$boardname:blue:lan2" "switch0" "0x04" + ucidef_set_led_switch "wan" "wan" "blue:wan" "switch0" "0x10" + ucidef_set_led_switch "lan1" "lan1" "blue:lan1" "switch0" "0x08" + ucidef_set_led_switch "lan2" "lan2" "blue:lan2" "switch0" "0x04" ;; glinet,gl-mt300n-v2) - set_wifi_led "$boardname:red:wlan" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x1" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wlan" "wlan0" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x1" ;; hilink,hlk-7628n|\ skylab,skw92a) - set_wifi_led "$boardname:green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; hiwifi,hc5661a|\ hiwifi,hc5761a) - ucidef_set_led_switch "internet" "internet" "$boardname:blue:internet" "switch0" "0x10" + ucidef_set_led_switch "internet" "internet" "blue:internet" "switch0" "0x10" ;; mediatek,linkit-smart-7688) - ucidef_set_led_wlan "wifi" "wifi" "linkit-smart-7688:orange:wifi" "phy0tpt" + ucidef_set_led_wlan "wifi" "wifi" "orange:wifi" "phy0tpt" ;; rakwireless,rak633) - set_wifi_led "$boardname:blue:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" ;; tama,w06) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" - ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" + ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" + ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" ;; tplink,archer-c20-v4|\ -tplink,archer-c20-v5) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" +tplink,archer-c20-v5|\ +tplink,tl-wr850n-v2) + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ;; tplink,archer-c50-v3|\ tplink,archer-c50-v4) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" - ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "wlan5g" "$boardname:green:wlan5g" "phy1tpt" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" + ucidef_set_led_wlan "wlan2g" "wlan2g" "green:wlan2g" "phy0tpt" + ucidef_set_led_wlan "wlan5g" "wlan5g" "green:wlan5g" "phy1tpt" ;; tplink,re200-v2|\ tplink,re200-v3|\ tplink,re220-v2|\ tplink,tl-mr3020-v3|\ tplink,tl-wa801nd-v5) - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0" + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0" ;; tplink,tl-mr3420-v5|\ +tplink,tl-wr840n-v4|\ tplink,tl-wr842n-v5) - ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" - ;; -tplink,tl-wr840n-v4) - ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ucidef_set_led_wlan "wlan2g" "wlan2g" "green:wlan" "phy0tpt" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ;; tplink,tl-wr841n-v13) - ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" - ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x2" - ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x4" - ucidef_set_led_switch "lan3" "lan3" "$boardname:green:lan3" "switch0" "0x8" - ucidef_set_led_switch "lan4" "lan4" "$boardname:green:lan4" "switch0" "0x10" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ucidef_set_led_wlan "wlan2g" "wlan2g" "green:wlan" "phy0tpt" + ucidef_set_led_switch "lan1" "lan1" "green:lan1" "switch0" "0x2" + ucidef_set_led_switch "lan2" "lan2" "green:lan2" "switch0" "0x4" + ucidef_set_led_switch "lan3" "lan3" "green:lan3" "switch0" "0x8" + ucidef_set_led_switch "lan4" "lan4" "green:lan4" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ;; -tplink,tl-wr841n-v14|\ -tplink,tl-wr850n-v2) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" +tplink,tl-wr841n-v14) + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x1e" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" + ucidef_set_led_wlan "wifi_led" "wifi" "green:wlan" "phy0tpt" ;; tplink,tl-wr902ac-v3) - ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt" - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_wlan "wlan2g" "wlan2g" "green:wlan" "phy0tpt" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; unielec,u7628-01-16m) - ucidef_set_led_switch "lan1" "lan1" "u7628-01:green:lan1" "switch0" "0x2" - ucidef_set_led_switch "lan2" "lan2" "u7628-01:green:lan2" "switch0" "0x4" - ucidef_set_led_switch "lan3" "lan3" "u7628-01:green:lan3" "switch0" "0x8" - ucidef_set_led_switch "lan4" "lan4" "u7628-01:green:lan4" "switch0" "0x10" - ucidef_set_led_switch "wan" "wan" "u7628-01:green:wan" "switch0" "0x01" - set_wifi_led "u7628-01:green:wlan" + ucidef_set_led_switch "lan1" "lan1" "green:lan1" "switch0" "0x2" + ucidef_set_led_switch "lan2" "lan2" "green:lan2" "switch0" "0x4" + ucidef_set_led_switch "lan3" "lan3" "green:lan3" "switch0" "0x8" + ucidef_set_led_switch "lan4" "lan4" "green:lan4" "switch0" "0x10" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; wavlink,wl-wn570ha1) - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x01" ucidef_set_rssimon "wlan0" "200000" "1" - ucidef_set_led_rssi "wifi-low" "wifi-low" "$boardname:green:wifi-low" "wlan0" "1" "49" - ucidef_set_led_rssi "wifi-med" "wifi-med" "$boardname:green:wifi-med" "wlan0" "50" "84" - ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan0" "85" "100" - set_wifi_led "$boardname:green:wifi" + ucidef_set_led_rssi "wifi-low" "wifi-low" "green:wifi-low" "wlan0" "1" "49" + ucidef_set_led_rssi "wifi-med" "wifi-med" "green:wifi-med" "wlan0" "50" "84" + ucidef_set_led_rssi "wifi-high" "wifi-high" "green:wifi-high" "wlan0" "85" "100" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; wavlink,wl-wn575a3) ucidef_set_rssimon "wlan1" "200000" "1" - ucidef_set_led_rssi "wifi-low" "wifi-low" "$boardname:green:wifi-low" "wlan1" "1" "49" - ucidef_set_led_rssi "wifi-med" "wifi-med" "$boardname:green:wifi-med" "wlan1" "50" "84" - ucidef_set_led_rssi "wifi-high" "wifi-high" "$boardname:green:wifi-high" "wlan1" "85" "100" + ucidef_set_led_rssi "wifi-low" "wifi-low" "green:wifi-low" "wlan1" "1" "49" + ucidef_set_led_rssi "wifi-med" "wifi-med" "green:wifi-med" "wlan1" "50" "84" + ucidef_set_led_rssi "wifi-high" "wifi-high" "green:wifi-high" "wlan1" "85" "100" ;; wavlink,wl-wn577a2) - ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x8" - ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_switch "lan" "lan" "green:lan" "switch0" "0x8" + ucidef_set_led_switch "wan" "wan" "green:wan" "switch0" "0x10" ;; zbtlink,zbt-we1226) - set_wifi_led "$boardname:green:wlan" - ucidef_set_led_switch "lan1" "LAN1" "$boardname:green:lan1" "switch0" "0x01" - ucidef_set_led_switch "lan2" "LAN2" "$boardname:green:lan2" "switch0" "0x02" - ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x10" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" + ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x01" + ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x02" + ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x10" ;; zyxel,keenetic-extra-ii) - set_wifi_led "$boardname:green:wifi" - ucidef_set_led_switch "internet" "internet" "$boardname:green:internet" "switch0" "0x01" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" + ucidef_set_led_switch "internet" "internet" "green:internet" "switch0" "0x01" ;; esac diff --git a/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration deleted file mode 100644 index 44815b2ddc..0000000000 --- a/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration +++ /dev/null @@ -1,20 +0,0 @@ -. /lib/functions.sh -. /lib/functions/migrations.sh - -board=$(board_name) - -case "$board" in -tplink,archer-c20-v4) - migrate_leds "^c20-v4:=archer-c20-v4:" - ;; -tplink,archer-c50-v3) - migrate_leds "^c50-v3:=archer-c50-v3:" - ;; -tplink,archer-c50-v4) - migrate_leds "^c50-v4:=archer-c50-v4:" - ;; -esac - -migrations_apply system - -exit 0 diff --git a/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds b/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds index a042ecfbda..b62ad76110 100755 --- a/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds @@ -3,29 +3,20 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in airlink101,ar670w|\ airlink101,ar725w) - set_wifi_led "rt2800soc-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800soc-phy0::radio" "wlan0" ;; belkin,f5d8235-v1) - set_wifi_led "$boardname:blue:wireless" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wireless" "wlan0" ;; ralink,v11st-fe) - set_wifi_led "rt2800pci-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800pci-phy0::radio" "wlan0" ;; esac diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds index 8260b09821..1796ae50d8 100755 --- a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds @@ -3,29 +3,21 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in 7links,px-4885-4m|\ -7links,px-4885-8m) - set_wifi_led "px-4885:orange:wifi" +7links,px-4885-8m|\ +fon,fonera-20n) + ucidef_set_led_netdev "wifi_led" "wifi" "orange:wifi" "wlan0" ;; airlive,air3gii|\ aximcom,mr-102n|\ edimax,3g-6200nl|\ netgear,wnce2001) - set_wifi_led "$boardname:green:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; alfa-network,w502u|\ dlink,dir-300-b1|\ @@ -44,66 +36,63 @@ tenda,w306r-v2|\ zyxel,keenetic-start|\ zyxel,keenetic|\ zyxel,nbg-419n-v2) - set_wifi_led "rt2800pci-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800pci-phy0::radio" "wlan0" ;; allnet,all0256n-4m|\ allnet,all0256n-8m) ucidef_set_rssimon "wlan0" "200000" "1" - ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6" - ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5" - ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8" - set_wifi_led "rt2800pci-phy0::radio" + ucidef_set_led_rssi "rssilow" "RSSILOW" "green:rssilow" "wlan0" "1" "40" "0" "6" + ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "green:rssimed" "wlan0" "30" "80" "-29" "5" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "green:rssihigh" "wlan0" "70" "100" "-69" "8" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800pci-phy0::radio" "wlan0" ;; alphanetworks,asl26555-8m|\ alphanetworks,asl26555-16m) - ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0" - set_wifi_led "asl26555:green:wlan" + ucidef_set_led_netdev "eth" "ETH" "green:eth" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" ;; asiarf,awapn2403) - set_wifi_led "rt2800soc-phy0::radio" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800soc-phy0::radio" "wlan0" ;; dlink,dcs-930l-b1) - ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps" + ucidef_set_led_netdev "wifi" "WiFi" "blue:wps" ;; dlink,dir-615-d) - ucidef_set_led_netdev "wan" "WAN (green)" "$boardname:green:wan" "eth0.2" - set_wifi_led "rt2800soc-phy0::radio" + ucidef_set_led_netdev "wan" "WAN (green)" "green:wan" "eth0.2" + ucidef_set_led_netdev "wifi_led" "wifi" "rt2800soc-phy0::radio" "wlan0" ;; dlink,dir-620-d1|\ trendnet,tew-714tru) - set_wifi_led "$boardname:green:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; edimax,3g-6200n|\ planex,mzk-w300nh2) - set_wifi_led "$boardname:amber:wlan" - ;; -fon,fonera-20n) - set_wifi_led "$boardname:orange:wifi" + ucidef_set_led_netdev "wifi_led" "wifi" "amber:wlan" "wlan0" ;; hauppauge,broadway) - set_wifi_led "$boardname:red:wps_active" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wps_active" "wlan0" ;; hootoo,ht-tm02) - ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:lan" "eth0" - set_wifi_led "$boardname:blue:wlan" + ucidef_set_led_netdev "eth" "Ethernet" "green:lan" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wlan" "wlan0" ;; huawei,hg255d) - set_wifi_led "$boardname:green:wlan" - ucidef_set_led_netdev "internet" "internet" "$boardname:green:internet" "eth0.2" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wlan" "wlan0" + ucidef_set_led_netdev "internet" "internet" "green:internet" "eth0.2" ;; intenso,memory2move) - set_wifi_led "$boardname:blue:wifi" - ucidef_set_led_netdev "eth" "Ethernet" "$boardname:green:wan" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "blue:wifi" "wlan0" + ucidef_set_led_netdev "eth" "Ethernet" "green:wan" "eth0" ;; omnima,miniembplug) - set_wifi_led "$boardname:red:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "red:wlan" "wlan0" ;; vocore,vocore-8m|\ vocore,vocore-16m) - ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0" + ucidef_set_led_netdev "eth" "ETH" "orange:eth" "eth0" ;; zorlik,zl5900v2) - ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0 + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0" ;; esac diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds index 1a72112c6f..6e8497aff6 100755 --- a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds @@ -3,29 +3,20 @@ . /lib/functions/leds.sh . /lib/functions/uci-defaults.sh -set_wifi_led() { - ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" -} - - board=$(board_name) -boardname="${board##*,}" board_config_update -led_wlan="$(get_dt_led wlan)" -[ -n "$led_wlan" ] && ucidef_set_led_wlan "wifi_led" "wifi" "$led_wlan" "phy0tpt" - case $board in belkin,f9k1109v1) - ucidef_set_led_netdev "lan" "lan" "$boardname:blue:wps" "eth0" + ucidef_set_led_netdev "lan" "lan" "blue:wps" "eth0" ;; edimax,br-6475nd) - set_wifi_led "$boardname:amber:wlan" + ucidef_set_led_netdev "wifi_led" "wifi" "amber:wlan" "wlan0" ;; omnima,hpm) - ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0" - set_wifi_led "$boardname:green:wifi" + ucidef_set_led_netdev "eth" "ETH" "green:eth" "eth0" + ucidef_set_led_netdev "wifi_led" "wifi" "green:wifi" "wlan0" ;; esac