ar71xx: fix LED defines for TP-Link TL-WR740N v6

Signed-off-by: Andrey Polischuk <androld.b@gmail.com>
[changed commit subject, dropped redundant kernel config symbol]
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

9 files changed, 112 insertions, 18 deletions

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 520a5cdb05..59a14271a7 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -697,6 +697,23 @@ tl-wpa8630)
 	ucidef_set_led_netdev "wlan" "WLAN" "$board:green:wlan" "wlan1"
 	ucidef_set_led_netdev "wlan5" "WLAN5" "$board:green:wlan5" "wlan0"
 	;;
+tl-wr740n-v6|\
+tl-wr841n-v9|\
+tl-wr841n-v11|\
+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_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
+
+	case "$board" in
+	tl-wr842n-v3)
+		ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
+		;;
+	esac
+	;;
 tl-wr802n-v1)
 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:system" "phy0tpt"
 	;;
@@ -718,22 +735,6 @@ tl-wr840n-v3)
 	ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x1E"
 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
 	;;
-tl-wr841n-v9|\
-tl-wr841n-v11|\
-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_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
-
-	case "$board" in
-	tl-wr842n-v3)
-		ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
-		;;
-	esac
-	;;
 tl-wr1043nd|\
 tl-wr1043nd-v2)
 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
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 6f72fc73f7..237d0264b3 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -43,6 +43,7 @@ ar71xx_setup_interfaces()
 	tl-mr3420|\
 	tl-wdr3320-v2|\
 	tl-wdr3500|\
+	tl-wr740n-v6|\
 	tl-wr741nd|\
 	tl-wr741nd-v4|\
 	tl-wr840n-v2|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 7a2cf927ff..ef48b133bd 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -385,6 +385,7 @@ get_status_led() {
 	tl-wr1043nd|\
 	tl-wr1043nd-v2|\
 	tl-wr1043nd-v4|\
+	tl-wr740n-v6|\
 	tl-wr741nd|\
 	tl-wr741nd-v4|\
 	tl-wa801nd-v3|\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b3de55d274..db5de727c1 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -1106,6 +1106,9 @@ ar71xx_board_detect() {
 	*"TL-WR720N"*)
 		name="tl-wr720n-v3"
 		;;
+	*"TL-WR740N/ND v6")
+		name="tl-wr740n-v6"
+		;;
 	*"TL-WR741ND")
 		name="tl-wr741nd"
 		;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index c70351c1f3..848aeffacc 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -427,6 +427,7 @@ platform_check_image() {
 	tl-wr703n|\
 	tl-wr710n|\
 	tl-wr720n-v3|\
+	tl-wr740n-v6|\
 	tl-wr741nd-v4|\
 	tl-wr741nd|\
 	tl-wr802n-v1|\
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 813d01a569..70c27a65be 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1649,7 +1649,7 @@ config ATH79_MACH_TL_WR841N_V8
 	select ATH79_DEV_WMAC
 
 config ATH79_MACH_TL_WR841N_V9
-	bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support"
+	bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3/TL-WR740N/ND v6 support"
 	select SOC_QCA953X
 	select ATH79_DEV_ETH
 	select ATH79_DEV_GPIO_BUTTONS
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
index 24a1a64352..304d8ff6e9 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
@@ -5,6 +5,7 @@
  *  Copyright (C) 2016 Cezary Jackiewicz <cezary@eko.one.pl>
  *  Copyright (C) 2016 Stijn Segers <francesco.borromini@gmail.com>
  *  Copyright (C) 2017 Vaclav Svoboda <svoboda@neng.cz>
+ *  Copyright (C) 2017 Andrey Polischuk <androld.b@gmail.com>
  *
  *  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
@@ -72,6 +73,19 @@
 #define TL_WR842NV3_GPIO_BTN_RESET	1
 #define TL_WR842NV3_GPIO_BTN_WIFI	0
 
+#define TL_WR740NV6_GPIO_LED_SYSTEM	1
+#define TL_WR740NV6_GPIO_LED_QSS	3
+#define TL_WR740NV6_GPIO_LED_WAN_ORANGE	2
+#define TL_WR740NV6_GPIO_LED_WAN_GREEN	4
+#define TL_WR740NV6_GPIO_LED_LAN1	16
+#define TL_WR740NV6_GPIO_LED_LAN2	15
+#define TL_WR740NV6_GPIO_LED_LAN3	14
+#define TL_WR740NV6_GPIO_LED_LAN4	11
+#define TL_WR740NV6_GPIO_LED_WLAN	13
+
+#define TL_WR740NV6_GPIO_BTN_RESET	12
+#define TL_WR740NV6_GPIO_BTN_WIFI	17
+
 #define TL_WR841NV9_KEYS_POLL_INTERVAL	20	/* msecs */
 #define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL)
 
@@ -271,6 +285,63 @@ static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = {
 	}
 };
 
+static struct gpio_led tl_wr740n_v6_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:lan1",
+		.gpio		= TL_WR740NV6_GPIO_LED_LAN1,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan2",
+		.gpio		= TL_WR740NV6_GPIO_LED_LAN2,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan3",
+		.gpio		= TL_WR740NV6_GPIO_LED_LAN3,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:lan4",
+		.gpio		= TL_WR740NV6_GPIO_LED_LAN4,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:system",
+		.gpio		= TL_WR740NV6_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:qss",
+		.gpio		= TL_WR740NV6_GPIO_LED_QSS,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wan",
+		.gpio		= TL_WR740NV6_GPIO_LED_WAN_GREEN,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:orange:wan",
+		.gpio		= TL_WR740NV6_GPIO_LED_WAN_ORANGE,
+		.active_low	= 1,
+	}, {
+		.name		= "tp-link:green:wlan",
+		.gpio		= TL_WR740NV6_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button tl_wr740n_v6_gpio_keys[] __initdata = {
+	{
+		.desc		= "Reset button",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR740NV6_GPIO_BTN_RESET,
+		.active_low	= 1,
+	}, {
+		.desc		= "WIFI button",
+		.type		= EV_KEY,
+		.code		= KEY_RFKILL,
+		.debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= TL_WR740NV6_GPIO_BTN_WIFI,
+		.active_low	= 1,
+	}
+};
 
 static void __init tl_ap143_setup(void)
 {
@@ -369,3 +440,18 @@ static void __init tl_wr842n_v3_setup(void)
 
 MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3",
 	     tl_wr842n_v3_setup);
+
+static void __init tl_wr740n_v6_setup(void)
+{
+	tl_ap143_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr740n_v6_leds_gpio),
+				 tl_wr740n_v6_leds_gpio);
+
+	ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(tl_wr740n_v6_gpio_keys),
+					tl_wr740n_v6_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR740N_V6, "TL-WR740N-v6", "TP-LINK TL-WR740N/ND v6",
+	     tl_wr740n_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 841badc14f..ddb91ad46d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -242,6 +242,7 @@ enum ath79_mach_type {
 	ATH79_MACH_TL_WR703N,			/* TP-LINK TL-WR703N */
 	ATH79_MACH_TL_WR710N,			/* TP-LINK TL-WR710N */
 	ATH79_MACH_TL_WR720N_V3,		/* TP-LINK TL-WR720N v3/v4 */
+	ATH79_MACH_TL_WR740N_V6,		/* TP-LINK TL-WR740N/ND v6 */
 	ATH79_MACH_TL_WR741ND,			/* TP-LINK TL-WR741ND */
 	ATH79_MACH_TL_WR741ND_V4,		/* TP-LINK TL-WR741ND v4 */
 	ATH79_MACH_TL_WR802N_V1,		/* TP-LINK TL-WR802N v1 */
diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
index 95bde34383..2d64846cc8 100644
--- a/target/linux/ar71xx/image/tp-link.mk
+++ b/target/linux/ar71xx/image/tp-link.mk
@@ -571,7 +571,7 @@ endef
 define Device/tl-wr740n-v6
   $(Device/tplink-4mlzma)
   DEVICE_TITLE := TP-LINK TL-WR740N/ND v6
-  BOARDNAME := TL-WR841N-v9
+  BOARDNAME := TL-WR740N-v6
   DEVICE_PROFILE := TLWR740
   TPLINK_HWID := 0x07400006
 endef