Merge pull request coolsnowwolf#537 from mcucore/master

add TP-Link WR941N V7 support

target/linux/ar71xx/base-files/etc/board.d/01_leds

@@ -852,6 +852,7 @@ tl-wa901nd)
 	;;
 tl-wa901nd-v2|\
 tl-wr941nd|\
+tl-wr941n-v7|\
 tl-wr1041n-v2)
 	ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
 	;;

target/linux/ar71xx/base-files/etc/board.d/02_network

@@ -505,6 +505,7 @@ ar71xx_setup_interfaces()
 	archer-c7-v4|\
 	archer-c7-v5|\
 	tl-wdr4300|\
+	tl-wr941n-v7|\
 	tl-wr1041n-v2)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"

target/linux/ar71xx/base-files/etc/diag.sh

@@ -479,6 +479,7 @@ get_status_led() {
 	tl-wr842n-v2|\
 	tl-wr842n-v3|\
 	tl-wr941nd|\
+	tl-wr941n-v7|\
 	tl-wr941nd-v5)
 		status_led="tp-link:green:system"
 		;;

target/linux/ar71xx/base-files/lib/ar71xx.sh

@@ -1368,6 +1368,9 @@ ar71xx_board_detect() {
 	*"TL-WR941N/ND v6")
 		name="tl-wr941nd-v6"
 		;;
+	*"TL-WR941N v7")
+		name="tl-wr941n-v7"
+		;;
 	*"TL-WR941ND")
 		name="tl-wr941nd"
 		;;

target/linux/ar71xx/base-files/lib/upgrade/platform.sh

@@ -492,6 +492,7 @@ platform_check_image() {
 	tl-wr941nd|\
 	tl-wr941nd-v5|\
 	tl-wr941nd-v6|\
+	tl-wr941n-v7|\
 	ts-d084|\
 	wifi-pineapple-nano)
 		local magic_ver="0100"

target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt

@@ -1984,6 +1984,15 @@ config ATH79_MACH_TL_WR941ND_V6
 	select ATH79_DEV_M25P80
 	select ATH79_DEV_WMAC
 
+config ATH79_MACH_TL_WR941N_V7
+	bool "TP-LINK TL-WR941N v7 support"
+	select SOC_QCA955X
+	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_WR940N_V4
 	bool "TP-LINK TL-WR940N v4 support"
 	select SOC_QCA956X

target/linux/ar71xx/files/arch/mips/ath79/Makefile

@@ -248,6 +248,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9)		+= mach-tl-wr841n-v9.o
 obj-$(CONFIG_ATH79_MACH_TL_WR902AC_V1)		+= mach-tl-wr902ac-v1.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_WR941N_V7)		+= mach-tl-wr941n-v7.o
 obj-$(CONFIG_ATH79_MACH_TL_WR940N_V4)		+= mach-tl-wr940n-v4.o
 obj-$(CONFIG_ATH79_MACH_TL_WR942N_V1)		+= mach-tl-wr942n-v1.o
 obj-$(CONFIG_ATH79_MACH_TS_D084)		+= mach-ts-d084.o

target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941n-v7.c

@@ -0,0 +1,281 @@
+/*
+ *  TP-LINK TL-WR941N v7 board support
+ *
+ *  Copyright (C) 2012 Gabor Juhos <[email protected]>
+ *  Copyright (C) 2014 Weijie Gao <[email protected]>
+ *  Copyright (c) 2018 Bin Chen <[email protected]>
+ *
+ *  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 <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/ath9k_platform.h>
+#include <linux/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+/* #include "dev-usb.h" */
+#include "dev-wmac.h"
+#include "machtypes.h"
+
+#define WR941NV7_GPIO_LED_WLAN			12
+#define WR941NV7_GPIO_LED_SYSTEM		19
+#define WR941NV7_GPIO_LED_QSS			15
+
+#define WR941NV7_GPIO_BTN_RESET		16
+
+#define WR941NV7_KEYS_POLL_INTERVAL		20	/* msecs */
+#define WR941NV7_KEYS_DEBOUNCE_INTERVAL	(3 * WR941NV7_KEYS_POLL_INTERVAL)
+
+#define ATH_MII_MGMT_CMD		0x24
+#define ATH_MGMT_CMD_READ		0x1
+
+#define ATH_MII_MGMT_ADDRESS		0x28
+#define ATH_ADDR_SHIFT			8
+
+#define ATH_MII_MGMT_CTRL		0x2c
+#define ATH_MII_MGMT_STATUS		0x30
+
+#define ATH_MII_MGMT_IND		0x34
+#define ATH_MGMT_IND_BUSY		(1 << 0)
+#define ATH_MGMT_IND_INVALID		(1 << 2)
+
+static const char *wr941nv7_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data wr941nv7_flash_data = {
+	.part_probes	= wr941nv7_part_probes,
+};
+
+static struct gpio_led wr941nv7_leds_gpio[] __initdata = {
+	{
+		.name		= "tp-link:green:qss",
+		.gpio		= WR941NV7_GPIO_LED_QSS,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:system",
+		.gpio		= WR941NV7_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+	{
+		.name		= "tp-link:green:wlan",
+		.gpio		= WR941NV7_GPIO_LED_WLAN,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button wr941nv7_gpio_keys[] __initdata = {
+	{
+		.desc		= "reset",
+		.type		= EV_KEY,
+		.code		= KEY_RESTART,
+		.debounce_interval = WR941NV7_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= WR941NV7_GPIO_BTN_RESET,
+		.active_low	= 1,
+	},
+};
+
+static struct mdio_board_info wr941nv7_mdio0_info[] = {
+	{
+		.bus_id = "ag71xx-mdio.0",
+		.phy_addr = 0,
+		.platform_data = NULL,
+	},
+};
+
+static unsigned long __init ath_gmac_reg_rd(unsigned long reg)
+{
+	void __iomem *base;
+	unsigned long t;
+
+	base = ioremap(AR71XX_GE0_BASE, AR71XX_GE0_SIZE);
+
+	t = __raw_readl(base + reg);
+
+	iounmap(base);
+
+	return t;
+}
+
+static void __init ath_gmac_reg_wr(unsigned long reg, unsigned long value)
+{
+	void __iomem *base;
+	unsigned long t = value;
+
+	base = ioremap(AR71XX_GE0_BASE, AR71XX_GE0_SIZE);
+
+	__raw_writel(t, base + reg);
+
+	iounmap(base);
+}
+
+static void __init phy_reg_write(unsigned char phy_addr, unsigned char reg, unsigned short data)
+{
+	unsigned short addr = (phy_addr << ATH_ADDR_SHIFT) | reg;
+	volatile int rddata;
+	unsigned short ii = 0xFFFF;
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	ath_gmac_reg_wr(ATH_MII_MGMT_ADDRESS, addr);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CTRL, data);
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+}
+
+static unsigned short __init phy_reg_read(unsigned char phy_addr, unsigned char reg)
+{
+	unsigned short addr = (phy_addr << ATH_ADDR_SHIFT) | reg, val;
+	volatile int rddata;
+	unsigned short ii = 0xffff;
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, 0x0);
+	ath_gmac_reg_wr(ATH_MII_MGMT_ADDRESS, addr);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, ATH_MGMT_CMD_READ);
+
+	do
+	{
+		udelay(5);
+		rddata = ath_gmac_reg_rd(ATH_MII_MGMT_IND) & 0x1;
+	} while (rddata && --ii);
+
+	val = ath_gmac_reg_rd(ATH_MII_MGMT_STATUS);
+	ath_gmac_reg_wr(ATH_MII_MGMT_CMD, 0x0);
+
+	return val;
+}
+
+static void __init athrs27_reg_write(unsigned int s27_addr, unsigned int s27_write_data)
+{
+	unsigned int addr_temp;
+	unsigned int data;
+	unsigned char phy_address, reg_address;
+
+	addr_temp = (s27_addr) >> 2;
+	data = addr_temp >> 7;
+
+	phy_address = 0x1f;
+	reg_address = 0x10;
+
+	phy_reg_write(phy_address, reg_address, data);
+
+	phy_address = (0x17 & ((addr_temp >> 4) | 0x10));
+
+	reg_address = (((addr_temp << 1) & 0x1e) | 0x1);
+	data = (s27_write_data >> 16) & 0xffff;
+	phy_reg_write(phy_address, reg_address, data);
+
+	reg_address = ((addr_temp << 1) & 0x1e);
+	data = s27_write_data  & 0xffff;
+	phy_reg_write(phy_address, reg_address, data);
+}
+
+static unsigned int __init athrs27_reg_read(unsigned int s27_addr)
+{
+	unsigned int addr_temp;
+	unsigned int s27_rd_csr_low, s27_rd_csr_high, s27_rd_csr;
+	unsigned int data;
+	unsigned char phy_address, reg_address;
+
+	addr_temp = s27_addr >>2;
+	data = addr_temp >> 7;
+
+	phy_address = 0x1f;
+	reg_address = 0x10;
+
+	phy_reg_write(phy_address, reg_address, data);
+
+	phy_address = (0x17 & ((addr_temp >> 4) | 0x10));
+	reg_address = ((addr_temp << 1) & 0x1e);
+	s27_rd_csr_low = (unsigned int) phy_reg_read(phy_address, reg_address);
+
+	reg_address = reg_address | 0x1;
+	s27_rd_csr_high = (unsigned int) phy_reg_read(phy_address, reg_address);
+	s27_rd_csr = (s27_rd_csr_high << 16) | s27_rd_csr_low ;
+
+	return (s27_rd_csr);
+}
+
+static void __init ar8236_reset(void)
+{
+	unsigned short i = 60;
+
+	athrs27_reg_write(0x0, athrs27_reg_read(0x0) | 0x80000000);
+	while (i--)
+	{
+		mdelay(100);
+		if (!(athrs27_reg_read(0x0) & 0x80000000))
+		break;
+	}
+}
+
+static void __init wr941nv7_setup(void)
+{
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff1000);
+
+	ath79_register_m25p80(&wr941nv7_flash_data);
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(wr941nv7_leds_gpio),
+				 wr941nv7_leds_gpio);
+	ath79_register_gpio_keys_polled(-1, WR941NV7_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(wr941nv7_gpio_keys),
+					wr941nv7_gpio_keys);
+	/* WiFi Port */
+	ath79_register_wmac(art, mac);
+
+	ar8236_reset();
+
+	ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_MII_GE0 |
+		QCA955X_ETH_CFG_MII_GE0_SLAVE);
+
+	mdiobus_register_board_info(wr941nv7_mdio0_info,
+				    ARRAY_SIZE(wr941nv7_mdio0_info));
+	ath79_register_mdio(0, 0x0);
+
+	/* WAN Port */
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+
+	/* GMAC0 is connected to an AR8236 switch */
+	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+	ath79_eth0_data.speed = SPEED_100;
+	ath79_eth0_data.duplex = DUPLEX_FULL;
+	ath79_eth0_data.phy_mask = BIT(0);
+	ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+	ath79_register_eth(0);
+
+	/* ath79_register_usb(); */
+}
+
+MIPS_MACHINE(ATH79_MACH_TL_WR941N_V7, "TL-WR941N-v7",
+	     "TP-LINK TL-WR941N v7",
+	     wr941nv7_setup);

target/linux/ar71xx/files/arch/mips/ath79/machtypes.h

@@ -310,6 +310,7 @@ enum ath79_mach_type {
 	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_TL_WR941N_V7,		/* TP-LINK TL-WR941N v7 */
 	ATH79_MACH_TL_WR940N_V4,		/* TP-LINK TL-WR940N v4 */
 	ATH79_MACH_TL_WR940N_V6,		/* TP-LINK TL-WR940N v6 */
 	ATH79_MACH_TL_WR942N_V1,		/* TP-LINK TL-WR942N v1 */

target/linux/ar71xx/image/tiny-tp-link.mk

@@ -686,3 +686,12 @@ define Device/tl-wr941nd-v6-cn
   TPLINK_HWID := 0x09410006
 endef
 TARGET_DEVICES += tl-wr941nd-v6-cn
+
+define Device/tl-wr941n-v7
+  $(Device/tplink-8mlzma)
+  DEVICE_TITLE := TP-LINK TL-WR941N/ND v7
+  BOARDNAME := TL-WR941N-v7
+  DEVICE_PROFILE := TLWR941
+  TPLINK_HWID := 0x09410007
+endef
+TARGET_DEVICES += tl-wr941n-v7