From a3feff21cfecacbcb3b492da9ac6a8c60fefb7bc Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 2 Nov 2015 19:26:15 +0100 Subject: [PATCH] ar71xx: add TP-LINK TL-WR941ND v6 support (again) --- ...k-add-correct-MAC-BB-name-for-ar9561.patch | 35 ++ ...-TL-WR941ND-v6-international-version.patch | 332 ++++++++++++++++++ targets/ar71xx-generic/profiles.mk | 6 +- 3 files changed, 370 insertions(+), 3 deletions(-) create mode 100644 patches/openwrt/0035-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch create mode 100644 patches/openwrt/0036-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch diff --git a/patches/openwrt/0035-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch b/patches/openwrt/0035-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch new file mode 100644 index 00000000..b82614fc --- /dev/null +++ b/patches/openwrt/0035-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch @@ -0,0 +1,35 @@ +From: Matthias Schiffer +Date: Tue, 1 Sep 2015 19:59:16 +0200 +Subject: mac80211: ath9k: add correct MAC/BB name for ar9561 + +diff --git a/package/kernel/mac80211/patches/546-ath9k_add-correct-MAC-BB-name-for-ar9561.patch b/package/kernel/mac80211/patches/546-ath9k_add-correct-MAC-BB-name-for-ar9561.patch +new file mode 100644 +index 0000000..a2a2c78 +--- /dev/null ++++ b/package/kernel/mac80211/patches/546-ath9k_add-correct-MAC-BB-name-for-ar9561.patch +@@ -0,0 +1,25 @@ ++From 1165dd900cc8de3addbc8bef7e6196b07799d25e Mon Sep 17 00:00:00 2001 ++From: Miaoqing Pan ++Date: Wed, 12 Aug 2015 14:20:46 +0800 ++Subject: ath9k: add correct MAC/BB name for ar9561 ++ ++MAC/BB name is"????" if the MAC/BB is unknown. ++ ++Signed-off-by: Miaoqing Pan ++Signed-off-by: Kalle Valo ++ ++diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c ++index a31a680..1dd0339 100644 ++--- a/drivers/net/wireless/ath/ath9k/hw.c +++++ b/drivers/net/wireless/ath/ath9k/hw.c ++@@ -3186,6 +3186,7 @@ static struct { ++ { AR_SREV_VERSION_9550, "9550" }, ++ { AR_SREV_VERSION_9565, "9565" }, ++ { AR_SREV_VERSION_9531, "9531" }, +++ { AR_SREV_VERSION_9561, "9561" }, ++ }; ++ ++ /* For devices with external radios */ ++-- ++cgit v0.10.2 ++ diff --git a/patches/openwrt/0036-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch b/patches/openwrt/0036-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch new file mode 100644 index 00000000..e1e3b5a2 --- /dev/null +++ b/patches/openwrt/0036-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch @@ -0,0 +1,332 @@ +From: Matthias Schiffer +Date: Mon, 2 Nov 2015 19:21:20 +0100 +Subject: ar71xx: add support for TP-LINK TL-WR941ND v6 (international version) + +diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh +index 89fe53c..3e80c32 100644 +--- a/target/linux/ar71xx/base-files/etc/diag.sh ++++ b/target/linux/ar71xx/base-files/etc/diag.sh +@@ -279,7 +279,8 @@ get_status_led() { + tl-wdr4300 | \ + tl-wr703n | \ + tl-wr710n | \ +- tl-wr720n-v3) ++ tl-wr720n-v3 | \ ++ tl-wr941nd-v6) + status_led="tp-link:blue:system" + ;; + tl-wr841n-v9) +diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +index 5241db2..11b3fa0 100644 +--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds ++++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +@@ -460,6 +460,15 @@ tl-wr941nd-v5) + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" + ;; + ++tl-wr941nd-v6) ++ ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth0" ++ 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_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt" ++ ;; ++ + tl-wa830re-v2) + ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" +diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +index 5c38c54..2f0855c 100755 +--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network ++++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +@@ -226,6 +226,7 @@ tl-mr3420-v2 |\ + tl-wr841n-v8 |\ + tl-wr842n-v2 |\ + tl-wr941nd-v5 |\ ++tl-wr941nd-v6 |\ + wnr2000-v3 |\ + wnr2000-v4 |\ + wnr2200 |\ +diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh +index af92b01..9c7c139 100755 +--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh ++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh +@@ -799,6 +799,9 @@ ar71xx_board_detect() { + *"TL-WR941N/ND v5") + name="tl-wr941nd-v5" + ;; ++ *"TL-WR941N/ND v6") ++ name="tl-wr941nd-v6" ++ ;; + *"TL-WR703N v1") + name="tl-wr703n" + ;; +diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx +index f11ea8c..fd337e1 100644 +--- a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx ++++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx +@@ -35,6 +35,7 @@ set_preinit_iface() { + tl-wr720n-v3 |\ + tl-wr841n-v8 |\ + tl-wr842n-v2 |\ ++ tl-wr941nd-v6 |\ + wnr2000-v3 |\ + wnr2200 |\ + wnr612-v2 |\ +diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +index ab69e4f..f181a63 100755 +--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh ++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +@@ -354,6 +354,7 @@ platform_check_image() { + tl-wr842n-v2 | \ + tl-wr941nd | \ + tl-wr941nd-v5 | \ ++ tl-wr941nd-v6 | \ + tl-wr1041n-v2 | \ + tl-wr1043nd | \ + tl-wr1043nd-v2 | \ +diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18 +index e9b3c7c..84b5844 100644 +--- a/target/linux/ar71xx/config-3.18 ++++ b/target/linux/ar71xx/config-3.18 +@@ -132,6 +132,7 @@ CONFIG_ATH79_MACH_TL_WR841N_V1=y + CONFIG_ATH79_MACH_TL_WR841N_V8=y + CONFIG_ATH79_MACH_TL_WR841N_V9=y + CONFIG_ATH79_MACH_TL_WR941ND=y ++CONFIG_ATH79_MACH_TL_WR941ND_V6=y + CONFIG_ATH79_MACH_TUBE2H=y + CONFIG_ATH79_MACH_UBNT=y + CONFIG_ATH79_MACH_UBNT_XM=y +diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c +new file mode 100644 +index 0000000..55b4c00 +--- /dev/null ++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c +@@ -0,0 +1,151 @@ ++/* ++ * TP-LINK TL-WR941N/ND v6 board support ++ * ++ * Copyright (C) 2015 Matthias Schiffer ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++#include "common.h" ++#include "dev-eth.h" ++#include "dev-gpio-buttons.h" ++#include "dev-leds-gpio.h" ++#include "dev-m25p80.h" ++#include "dev-wmac.h" ++#include "machtypes.h" ++ ++ ++#define TL_WR941ND_V6_GPIO_LED_QSS 3 ++#define TL_WR941ND_V6_GPIO_LED_WAN 14 ++#define TL_WR941ND_V6_GPIO_LED_WAN_RED 15 ++#define TL_WR941ND_V6_GPIO_LED_LAN1 7 ++#define TL_WR941ND_V6_GPIO_LED_LAN2 6 ++#define TL_WR941ND_V6_GPIO_LED_LAN3 5 ++#define TL_WR941ND_V6_GPIO_LED_LAN4 4 ++#define TL_WR941ND_V6_GPIO_LED_WLAN 8 ++#define TL_WR941ND_V6_GPIO_LED_SYSTEM 18 ++ ++#define TL_WR941ND_V6_GPIO_BTN_RESET 1 ++#define TL_WR941ND_V6_GPIO_BTN_RFKILL 2 ++ ++#define TL_WR941ND_V6_KEYS_POLL_INTERVAL 20 ++#define TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR941ND_V6_KEYS_POLL_INTERVAL) ++ ++ ++static struct gpio_led tl_wr941nd_v6_leds_gpio[] __initdata = { ++ { ++ .name = "tp-link:blue:qss", ++ .gpio = TL_WR941ND_V6_GPIO_LED_QSS, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:wan", ++ .gpio = TL_WR941ND_V6_GPIO_LED_WAN, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:red:wan", ++ .gpio = TL_WR941ND_V6_GPIO_LED_WAN_RED, ++ .active_low = 0, ++ }, ++ { ++ .name = "tp-link:blue:lan1", ++ .gpio = TL_WR941ND_V6_GPIO_LED_LAN1, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:lan2", ++ .gpio = TL_WR941ND_V6_GPIO_LED_LAN2, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:lan3", ++ .gpio = TL_WR941ND_V6_GPIO_LED_LAN3, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:lan4", ++ .gpio = TL_WR941ND_V6_GPIO_LED_LAN4, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:wlan", ++ .gpio = TL_WR941ND_V6_GPIO_LED_WLAN, ++ .active_low = 1, ++ }, ++ { ++ .name = "tp-link:blue:system", ++ .gpio = TL_WR941ND_V6_GPIO_LED_SYSTEM, ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_keys_button tl_wr941nd_v6_gpio_keys[] __initdata = { ++ { ++ .desc = "Reset button", ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .debounce_interval = TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL, ++ .gpio = TL_WR941ND_V6_GPIO_BTN_RESET, ++ .active_low = 1, ++ }, { ++ .desc = "RFKILL button", ++ .type = EV_KEY, ++ .code = KEY_RFKILL, ++ .debounce_interval = TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL, ++ .gpio = TL_WR941ND_V6_GPIO_BTN_RFKILL, ++ .active_low = 1, ++ } ++}; ++ ++ ++static const char *tl_wr941n_v6_part_probes[] = { ++ "tp-link", ++ NULL, ++}; ++ ++static struct flash_platform_data tl_wr941n_v6_flash_data = { ++ .part_probes = tl_wr941n_v6_part_probes, ++}; ++ ++ ++static void __init tl_wr941nd_v6_setup(void) ++{ ++ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); ++ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); ++ ++ ath79_register_m25p80(&tl_wr941n_v6_flash_data); ++ ++ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_v6_leds_gpio), ++ tl_wr941nd_v6_leds_gpio); ++ ++ ath79_register_gpio_keys_polled(-1, TL_WR941ND_V6_KEYS_POLL_INTERVAL, ++ ARRAY_SIZE(tl_wr941nd_v6_gpio_keys), ++ tl_wr941nd_v6_gpio_keys); ++ ++ ath79_register_mdio(0, 0x0); ++ ++ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1); ++ ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1); ++ ++ ath79_switch_data.phy4_mii_en = 1; ++ ath79_switch_data.phy_poll_mask = BIT(0); ++ ath79_eth0_data.phy_mask = BIT(0); ++ ++ ath79_register_eth(0); ++ ath79_register_eth(1); ++ ++ ath79_register_wmac(ee, mac); ++ ++} ++ ++MIPS_MACHINE(ATH79_MACH_TL_WR941ND_V6, "TL-WR941ND-v6", "TP-LINK TL-WR941N/ND v6", ++ tl_wr941nd_v6_setup); +diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile +index 3a17420..cc25be7 100644 +--- a/target/linux/ar71xx/image/Makefile ++++ b/target/linux/ar71xx/image/Makefile +@@ -600,7 +600,7 @@ endef + + define Device/tl-wr941nd-v6 + $(Device/tplink-4mlzma) +- BOARDNAME := TL-WDR3500 ++ BOARDNAME := TL-WR941ND-v6 + DEVICE_PROFILE := TLWR941 + TPLINK_HWID := 0x09410006 + endef +diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +index 2fa041b..185cb9c 100644 +--- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch ++++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +@@ -1,6 +1,6 @@ + --- a/arch/mips/ath79/machtypes.h + +++ b/arch/mips/ath79/machtypes.h +-@@ -16,22 +16,197 @@ ++@@ -16,22 +16,198 @@ + + enum ath79_mach_type { + ATH79_MACH_GENERIC = 0, +@@ -148,6 +148,7 @@ + + ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ + + ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ + + ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */ +++ ATH79_MACH_TL_WR941ND_V6, /* TP-LINK TL-WR941ND v6 */ + + ATH79_MACH_TUBE2H, /* Alfa Network Tube2H */ + + ATH79_MACH_UBNT_AIRGW, /* Ubiquiti AirGateway */ + ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ +@@ -271,7 +272,7 @@ + config ATH79_MACH_AP121 + bool "Atheros AP121 reference board" + select SOC_AR933X +-@@ -11,62 +75,1041 @@ config ATH79_MACH_AP121 ++@@ -11,62 +75,1050 @@ config ATH79_MACH_AP121 + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + select ATH79_DEV_WMAC +@@ -1246,6 +1247,15 @@ + + select ATH79_DEV_M25P80 + + select ATH79_DEV_WMAC + + +++config ATH79_MACH_TL_WR941ND_V6 +++ bool "TP-LINK TL-WR941ND v6 support" +++ select SOC_QCA956X +++ select ATH79_DEV_ETH +++ select ATH79_DEV_GPIO_BUTTONS +++ select ATH79_DEV_LEDS_GPIO +++ select ATH79_DEV_M25P80 +++ select ATH79_DEV_WMAC +++ + +config ATH79_MACH_TL_WR1041N_V2 + + bool "TP-LINK TL-WR1041N v2 support" + + select SOC_AR934X +@@ -1474,7 +1484,7 @@ + endif + --- a/arch/mips/ath79/Makefile + +++ b/arch/mips/ath79/Makefile +-@@ -38,9 +38,126 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route ++@@ -38,9 +38,127 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route + # + # Machines + # +@@ -1566,6 +1576,7 @@ + +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8) += mach-tl-wr841n-v8.o + +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9) += mach-tl-wr841n-v9.o + +obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o +++obj-$(CONFIG_ATH79_MACH_TL_WR941ND_V6) += mach-tl-wr941nd-v6.o + +obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o + +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o + +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2) += mach-tl-wr1043nd-v2.o diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 58136f19..9bde4de6 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -72,13 +72,13 @@ $(eval $(call GluonModel,TLWR941,tl-wr941nd-v2,tp-link-tl-wr941n-nd-v2)) $(eval $(call GluonModel,TLWR941,tl-wr941nd-v3,tp-link-tl-wr941n-nd-v3)) $(eval $(call GluonModel,TLWR941,tl-wr941nd-v4,tp-link-tl-wr941n-nd-v4)) $(eval $(call GluonModel,TLWR941,tl-wr941nd-v5,tp-link-tl-wr941n-nd-v5)) -ifeq ($(BROKEN),1) -# $(eval $(call GluonModel,TLWR941,tl-wr941nd-v6,tp-link-tl-wr941n-nd-v6)) # BROKEN: needs mac80211 update +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v6,tp-link-tl-wr941n-nd-v6)) +ifeq ($(BROKEN),1) $(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v4,tp-link-tl-wr940n-nd-v1)) # BROKEN: untested $(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v5,tp-link-tl-wr940n-nd-v2)) # BROKEN: untested -# $(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v6,tp-link-tl-wr940n-nd-v3)) # BROKEN: needs mac80211 update endif +$(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v6,tp-link-tl-wr940n-nd-v3)) # TL-WR1043N/ND v1, v2 $(eval $(call GluonProfile,TLWR1043))