diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index d9bed5b9c3..9f168ceba4 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2020-02-05 -PKG_SOURCE_VERSION:=dbdef938279ec649b25b98a9b61f81f17953ef21 -PKG_MIRROR_HASH:=6138cb72ed1f3c0a4e2b32e0734ed41c65beb4baeed0693153979877c726aad7 +PKG_SOURCE_DATE:=2020-03-26 +PKG_SOURCE_VERSION:=b1e83288fdbf9ac80f5377b279404adaf05e0c4d +PKG_MIRROR_HASH:=bf467f0bb2a8ea270023342c3bd949ada00afc90fd02717cb2f6886230d9b362 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index 80da7ee19d..53588fd284 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=16 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git -PKG_SOURCE_DATE:=2019-01-11 -PKG_SOURCE_VERSION:=e199804b602a48eb69f0752584c0ad28495b82ad -PKG_MIRROR_HASH:=e7e483d9fe066b8d270474b987227593a7f5c5fc8e2a46aebc5cd9d16f61805a +PKG_SOURCE_DATE:=2020-03-26 +PKG_SOURCE_VERSION:=49305e6847efa43e008d0bebdc176e1833120947 +PKG_MIRROR_HASH:=85e99184a8f5ff0159bab55887fb0cd332d6b7afbf8af7b2477cda0536c6f4d9 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index c5fe5bdcc1..1a92ad927d 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -75,6 +75,7 @@ get_status_led() { fritz300e|\ fritz4020|\ fritz450e|\ + gl-ar750s|\ gl-usb150|\ mr12|\ mr16|\ diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts new file mode 100644 index 0000000000..237a40d693 --- /dev/null +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wa860re-v1.dts @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9341_tplink_tl-wa.dtsi" + +/ { + model = "TP-Link TL-WA860RE v1"; + compatible = "tplink,tl-wa860re-v1", "qca,ar9341"; + + aliases { + led-boot = &led_power_green; + led-failsafe = &led_power_orange; + led-running = &led_power_green; + led-upgrade = &led_power_orange; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "Reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wps { + label = "WPS"; + linux,code = ; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + onoff { + label = "ONOFF"; + linux,code = ; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + lan { + label = "tp-link:green:lan"; + gpios = <&gpio 20 GPIO_ACTIVE_LOW>; + }; + + led_power_green: power_green { + label = "tp-link:green:power"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + default-state = "on"; + }; + + led_power_orange: power_orange { + label = "tp-link:orange:power"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + wlan_green { + label = "tp-link:green:wlan"; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wlan_orange { + label = "tp-link:orange:wlan"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + }; + }; +}; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4310-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4310-v1.dts new file mode 100644 index 0000000000..3fa4af518b --- /dev/null +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4310-v1.dts @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9344_tplink_tl-wdr4300.dtsi" + +/ { + model = "TP-Link TL-WDR4310 v1"; + compatible = "tplink,tl-wdr4310-v1", "qca,ar9344"; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 9db21caad8..48bdf657d0 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -237,7 +237,8 @@ ath79_setup_interfaces() tplink,archer-c7-v5|\ tplink,tl-wdr3600-v1|\ tplink,tl-wdr4300-v1|\ - tplink,tl-wdr4300-v1-il) + tplink,tl-wdr4300-v1-il|\ + tplink,tl-wdr4310-v1) ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" ;; diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index a96b44b1c9..da2063c58a 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -75,6 +75,7 @@ case "$FIRMWARE" in tplink,tl-wdr3600-v1|\ tplink,tl-wdr4300-v1|\ tplink,tl-wdr4300-v1-il|\ + tplink,tl-wdr4310-v1|\ tplink,tl-wdr4900-v2|\ winchannel,wb2000) caldata_extract "art" 0x5000 0x440 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 56fac4a36b..cffc2e6c4b 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 @@ -24,7 +24,8 @@ tplink,tl-wr902ac-v1) tplink,archer-c7-v2|\ tplink,tl-wdr3600-v1|\ tplink,tl-wdr4300-v1|\ -tplink,tl-wdr4300-v1-il) +tplink,tl-wdr4300-v1-il|\ +tplink,tl-wdr4310-v1) migrate_leds ":blue:=:green:" ;; tplink,re355-v1) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 4c925cf850..56d21194d3 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -456,6 +456,17 @@ define Device/tplink_tl-wdr4300-v1-il endef TARGET_DEVICES += tplink_tl-wdr4300-v1-il +define Device/tplink_tl-wdr4310-v1 + $(Device/tplink-8mlzma) + SOC := ar9344 + DEVICE_MODEL := TL-WDR4310 + DEVICE_VARIANT := v1 + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport + TPLINK_HWID := 0x43100001 + SUPPORTED_DEVICES += tl-wdr4300 +endef +TARGET_DEVICES += tplink_tl-wdr4310-v1 + define Device/tplink_tl-wdr4900-v2 $(Device/tplink-8mlzma) SOC := qca9558 diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index dc91a74ae1..c533de3f4c 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -130,6 +130,16 @@ define Device/tplink_tl-wa850re-v2 endef TARGET_DEVICES += tplink_tl-wa850re-v2 +define Device/tplink_tl-wa860re-v1 + $(Device/tplink-4mlzma) + SOC := ar9341 + DEVICE_MODEL := TL-WA860RE + DEVICE_VARIANT := v1 + TPLINK_HWID := 0x08600001 + SUPPORTED_DEVICES += tl-wa860re +endef +TARGET_DEVICES += tplink_tl-wa860re-v1 + define Device/tplink_tl-wa901nd-v1 $(Device/tplink-4m) SOC := ar7240 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 ecd7aaaf35..9efe83d6ac 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 @@ -46,6 +46,7 @@ tplink,tl-wa701nd-v1|\ tplink,tl-wa730re-v1|\ tplink,tl-wa801nd-v1|\ tplink,tl-wa830re-v1|\ +tplink,tl-wa860re-v1|\ tplink,tl-wa901nd-v1) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" ;; diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network index d448144c93..74060205f4 100755 --- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network +++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network @@ -38,6 +38,7 @@ ath79_setup_interfaces() tplink,tl-wa830re-v1|\ tplink,tl-wa850re-v1|\ tplink,tl-wa850re-v2|\ + tplink,tl-wa860re-v1|\ tplink,tl-wa901nd-v1|\ tplink,tl-wa901nd-v2|\ tplink,tl-wr703n)