From eaa23aeae6274e4a6a3836d1f36489e86c6ea37b Mon Sep 17 00:00:00 2001
From: Christoph Krapp <achterin@googlemail.com>
Date: Thu, 17 May 2018 01:33:52 +0200
Subject: [PATCH] ar71xx: add support for TP-Link TL-WR940N v6 (#1389)

---
 docs/index.rst                                |   2 +-
 ...add-support-for-TP-Link-TL-WR940N-v6.patch | 233 ++++++++++++++++++
 targets/ar71xx-tiny                           |   3 +
 3 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch

diff --git a/docs/index.rst b/docs/index.rst
index 164d35040..9f6545e6b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -259,7 +259,7 @@ ar71xx-tiny
   - TL-WR743N/ND (v1, v2)
   - TL-WR841N/ND (v3, v5, v7, v8, v9, v10, v11, v12)
   - TL-WR843N/ND (v1)
-  - TL-WR940N (v1, v2, v3, v4, v5)
+  - TL-WR940N (v1, v2, v3, v4, v5, v6)
   - TL-WR941ND (v2, v3, v4, v5, v6)
 
 brcm2708-bcm2708
diff --git a/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch b/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch
new file mode 100644
index 000000000..3b5e101fa
--- /dev/null
+++ b/patches/lede/0085-ar71xx-add-support-for-TP-Link-TL-WR940N-v6.patch
@@ -0,0 +1,233 @@
+From: Robert Marko <robimarko@gmail.com>
+Date: Wed, 21 Feb 2018 13:15:17 +0100
+Subject: ar71xx: add support for TP-Link TL-WR940N v6
+
+Add support for TL-WR940N v6 board. It is pretty much the same as v5
+except they only left WAN LED and removed other ones.
+
+Installation: flash factory image through WEB UI or use TFTP.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+
+diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
+index f9483e9a706fbd98ce6a42e968bc0d31e9da5c84..5ac817cb5dd9f18c3ed24bae4e7de92db23b5fb9 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
++++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
+@@ -670,6 +670,9 @@ tl-wr941nd-v6)
+ 	ucidef_set_led_switch "lan4" "LAN4" "tp-link:blue:lan4" "switch0" "0x02"
+ 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt"
+ 	;;
++tl-wr940n-v6)
++	ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth0"
++	;;
+ tl-wr841n-v9|\
+ tl-wr841n-v11|\
+ tl-wr842n-v3)
+diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
+index 1690172b5dfac1e1aa278c38c27ba64cfd61ade0..f6d21204ccf48456124e2c9705911c3a5841ad52 100755
+--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
++++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
+@@ -297,6 +297,7 @@ ar71xx_setup_interfaces()
+ 	tl-wdr6500-v2|\
+ 	tl-wr841n-v8|\
+ 	tl-wr940n-v4|\
++	tl-wr940n-v6|\
+ 	tl-wr941nd-v5|\
+ 	tl-wr941nd-v6|\
+ 	wnr1000-v2|\
+diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
+index 382500b75ee6dc1fe1126fb3121f4ae205c901d4..4d792e773c8efe0cb2e5e328d777db853cdd846b 100644
+--- a/target/linux/ar71xx/base-files/etc/diag.sh
++++ b/target/linux/ar71xx/base-files/etc/diag.sh
+@@ -397,6 +397,9 @@ get_status_led() {
+ 	tl-wr941nd-v6)
+ 		status_led="tp-link:blue:system"
+ 		;;
++	tl-wr940n-v6)
++		status_led="tp-link:orange:diag"
++		;;
+ 	tl-wr841n-v9)
+ 		status_led="tp-link:green:qss"
+ 		;;
+diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+index 59ede17653bbb1994ce9fa734c86c877aedf67e4..99eafe88da8213f5475dedf71054083b73db33d7 100755
+--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
+@@ -1079,6 +1079,9 @@ ar71xx_board_detect() {
+ 	*TL-WR941ND)
+ 		name="tl-wr941nd"
+ 		;;
++	*"TL-WR940N v6")
++		name="tl-wr940n-v6"
++		;;
+ 	*"TL-WR941N/ND v5")
+ 		name="tl-wr941nd-v5"
+ 		;;
+diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+index 5e8a06a7ae70ec349693c09deedbfce41a52cfc2..b3f558131811bcb37632b8847686de68c44319d8 100755
+--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+@@ -443,6 +443,7 @@ platform_check_image() {
+ 	tl-wr941nd-v5|\
+ 	tl-wr941nd-v6|\
+ 	tl-wr940n-v4|\
++	tl-wr940n-v6|\
+ 	tl-wr941nd)
+ 		local magic_ver="0100"
+ 
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c
+index d693b947c843d2a74cd252503fa8bf68b20da4ab..b530622d9f00b8ce3b906ad5fe62de019d82763a 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c
++++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c
+@@ -1,5 +1,5 @@
+ /*
+- *  TP-LINK TL-WR940N v4 board support
++ *  TP-LINK TL-WR940N v4 and v6 board support
+  *
+  *  Copyright (C) 2016 David Lutz <kpanic@ff3l.net>
+  *
+@@ -32,12 +32,15 @@
+ #define TL_WR940N_V4_GPIO_LED_LAN1		8
+ #define TL_WR940N_V4_GPIO_LED_WLAN		7
+ #define TL_WR940N_V4_GPIO_LED_SYSTEM		5
++/* WR940N v6 specific GPIO*/
++#define TL_WR940N_V6_GPIO_LED_DIAG_ORANGE	15
++#define TL_WR940N_V6_GPIO_LED_WAN_BLUE		14
+ 
+ #define TL_WR940N_V4_GPIO_BTN_RESET		1
+ #define TL_WR940N_V4_GPIO_BTN_RFKILL		2
+ 
+-#define TL_WR940N_V4_KEYS_POLL_INTERVAL	20
+-#define TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL	(3 * TL_WR940N_V4_KEYS_POLL_INTERVAL)
++#define TL_WR940N_KEYS_POLL_INTERVAL		20
++#define TL_WR940N_KEYS_DEBOUNCE_INTERVAL	(3 * TL_WR940N_KEYS_POLL_INTERVAL)
+ 
+ 
+ static struct gpio_led tl_wr940n_v4_leds_gpio[] __initdata = {
+@@ -93,43 +96,49 @@ static struct gpio_keys_button tl_wr940n_v4_gpio_keys[] __initdata = {
+ 		.desc		= "Reset button",
+ 		.type		= EV_KEY,
+ 		.code		= KEY_RESTART,
+-		.debounce_interval = TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL,
++		.debounce_interval = TL_WR940N_KEYS_DEBOUNCE_INTERVAL,
+ 		.gpio		= TL_WR940N_V4_GPIO_BTN_RESET,
+ 		.active_low	= 1,
+ 	}, {
+ 		.desc		= "RFKILL button",
+ 		.type		= EV_KEY,
+ 		.code		= KEY_RFKILL,
+-		.debounce_interval = TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL,
++		.debounce_interval = TL_WR940N_KEYS_DEBOUNCE_INTERVAL,
+ 		.gpio		= TL_WR940N_V4_GPIO_BTN_RFKILL,
+ 		.active_low	= 1,
+ 	}
+ };
+ 
++static struct gpio_led tl_wr940n_v6_leds_gpio[] __initdata = {
++	{
++		.name		= "tp-link:blue:wan",
++		.gpio		= TL_WR940N_V6_GPIO_LED_WAN_BLUE,
++		.active_low	= 1,
++	},
++	{
++		.name		= "tp-link:orange:diag",
++		.gpio		= TL_WR940N_V6_GPIO_LED_DIAG_ORANGE,
++		.active_low	= 0,
++	},
++};
++
+ 
+-static const char *tl_wr940n_v4_part_probes[] = {
++static const char *tl_wr940n_part_probes[] = {
+ 	"tp-link",
+ 	NULL,
+ };
+ 
+-static struct flash_platform_data tl_wr940n_v4_flash_data = {
+-	.part_probes	= tl_wr940n_v4_part_probes,
++static struct flash_platform_data tl_wr940n_flash_data = {
++	.part_probes	= tl_wr940n_part_probes,
+ };
+ 
+ 
+-static void __init tl_wr940n_v4_setup(void)
++static void __init tl_wr940n_setup(void)
+ {
+ 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+ 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+ 
+-	ath79_register_m25p80(&tl_wr940n_v4_flash_data);
+-
+-	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr940n_v4_leds_gpio),
+-				 tl_wr940n_v4_leds_gpio);
+-
+-	ath79_register_gpio_keys_polled(-1, TL_WR940N_V4_KEYS_POLL_INTERVAL,
+-					ARRAY_SIZE(tl_wr940n_v4_gpio_keys),
+-					tl_wr940n_v4_gpio_keys);
++	ath79_register_m25p80(&tl_wr940n_flash_data);
+ 
+ 	ath79_register_mdio(0, 0x0);
+ 
+@@ -145,5 +154,31 @@ static void __init tl_wr940n_v4_setup(void)
+ 
+ }
+ 
++static void __init tl_wr940n_v4_setup(void)
++{
++	tl_wr940n_setup();
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr940n_v4_leds_gpio),
++				 tl_wr940n_v4_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, TL_WR940N_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(tl_wr940n_v4_gpio_keys),
++					tl_wr940n_v4_gpio_keys);
++}
++
++static void __init tl_wr940n_v6_setup(void)
++{
++	tl_wr940n_setup();
++
++	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr940n_v6_leds_gpio),
++				 tl_wr940n_v6_leds_gpio);
++
++	ath79_register_gpio_keys_polled(-1, TL_WR940N_KEYS_POLL_INTERVAL,
++					ARRAY_SIZE(tl_wr940n_v4_gpio_keys),
++					tl_wr940n_v4_gpio_keys);
++}
++
+ MIPS_MACHINE(ATH79_MACH_TL_WR940N_V4, "TL-WR940N-v4", "TP-LINK TL-WR940N v4",
+ 	     tl_wr940n_v4_setup);
++MIPS_MACHINE(ATH79_MACH_TL_WR940N_V6, "TL-WR940N-v6", "TP-LINK TL-WR940N v6",
++	     tl_wr940n_v6_setup);
+diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+index 72c1e38c74707aba8fbd3aebc36f35becabd4987..24ff1dc7330264a91d01502715d0de676f789179 100644
+--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
++++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+@@ -241,6 +241,7 @@ enum ath79_mach_type {
+ 	ATH79_MACH_TL_WR941ND_V5,		/* TP-LINK TL-WR941ND v5 */
+ 	ATH79_MACH_TL_WR941ND_V6,		/* TP-LINK TL-WR941ND v6 */
+ 	ATH79_MACH_TL_WR940N_V4,		/* TP-LINK TL-WR940N v4 */
++	ATH79_MACH_TL_WR940N_V6,		/* TP-LINK TL-WR940N v6 */
+ 	ATH79_MACH_TUBE2H,			/* Alfa Network Tube2H */
+ 	ATH79_MACH_UBNT_AIRGW,			/* Ubiquiti AirGateway */
+ 	ATH79_MACH_UBNT_AIRGWP,			/* Ubiquiti AirGateway Pro */
+diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
+index 60dfe0e3edafcadad4ddc08be7645b49f269907c..1e40d943ac2aa43aea670fd86268708aea39a46c 100644
+--- a/target/linux/ar71xx/image/tp-link.mk
++++ b/target/linux/ar71xx/image/tp-link.mk
+@@ -857,6 +857,14 @@ define Device/tl-wr940n-v4
+     IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
+ endef
+ 
++define Device/tl-wr940n-v6
++  $(Device/tl-wr940n-v4)
++  DEVICE_TITLE := TP-LINK TL-WR940N v6
++  BOARDNAME := TL-WR940N-v6
++  TPLINK_HWID := 0x09400006
++endef
++TARGET_DEVICES += tl-wr940n-v6
++
+ # Chinese version (unlike European) is similar to the TL-WDR3500
+ define Device/tl-wr941nd-v6-cn
+     $(Device/tplink-4mlzma)
diff --git a/targets/ar71xx-tiny b/targets/ar71xx-tiny
index fd779d77d..271caaa2a 100644
--- a/targets/ar71xx-tiny
+++ b/targets/ar71xx-tiny
@@ -71,6 +71,9 @@ device tp-link-tl-wr940n-v4 tl-wr940n-v4
 alias tp-link-tl-wr940n-v5
 factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
 
+device tp-link-tl-wr940n-v6 tl-wr940n-v6
+factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
+
 device tp-link-tl-wa730re-v1 tl-wa730re-v1
 
 device tp-link-tl-wa750re-v1 tl-wa750re-v1
-- 
GitLab