From patchwork Wed Feb 18 18:59:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Frenzel X-Patchwork-Id: 441042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1CA7D14007F for ; Thu, 19 Feb 2015 05:59:53 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6F2A528C148; Wed, 18 Feb 2015 19:59:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AC24A28C147 for ; Wed, 18 Feb 2015 19:59:33 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from mail.scunc.net (web01.rk02.scunc.org [5.9.129.219]) by arrakis.dune.hu (Postfix) with ESMTP for ; Wed, 18 Feb 2015 19:59:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.scunc.net (Postfix) with ESMTP id CF26C33B97 for ; Wed, 18 Feb 2015 19:59:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at web01.rk01.scunc.org Received: from mail.scunc.net ([127.0.0.1]) by localhost (web01.rk02.scunc.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HLssr4cM29lO for ; Wed, 18 Feb 2015 19:59:22 +0100 (CET) Received: from bytemaxx.is-a-geek.net (unknown [IPv6:2001:5c0:1501:6000:76d4:35ff:fe9f:3437]) by mail.scunc.net (Postfix) with ESMTPSA id 7B08733B90 for ; Wed, 18 Feb 2015 19:59:22 +0100 (CET) Date: Wed, 18 Feb 2015 19:59:20 +0100 From: Hendrik Frenzel To: openwrt-devel@lists.openwrt.org Message-ID: <20150218185920.GA3904@bytemaxx.is-a-geek.net> References: <20150217201406.GC29458@bytemaxx.is-a-geek.net> <54E45A7E.6050101@web.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <54E45A7E.6050101@web.de> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [OpenWrt-Devel] [PATCH] ar71xx: TL-WA7210n v2 support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" On Wed, Feb 18, 2015 at 10:25:18AM +0100, Dirk Neukirchen wrote: > On 17.02.2015 21:14, Hendrik Frenzel wrote: > > This patch adds support for TP-Link TL-WA7210n[0] > > > > [0] http://www.tplink.com/en/products/details/?model=TL-WA7210N > > > > ./scripts/checkpatch.pl complains several times about: > > - WARNING: please, no space before tabs > - WARNING: line over 80 characters > - ERROR: code indent should use tabs where possible > - ERROR: do not use C99 // comments Thanks you or reviewig this, I was not aware of this script. Now I fixed all errors and most warnings. Signed-off-by: Hendrik Frenzel --- .../ar71xx/base-files/etc/uci-defaults/01_leds | 9 ++ .../ar71xx/base-files/etc/uci-defaults/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 6 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-3.18 | 1 + .../files/arch/mips/ath79/mach-tl-wa7210n-v2.c | 125 +++++++++++++++++++++ target/linux/ar71xx/generic/profiles/tp-link.mk | 10 ++ target/linux/ar71xx/image/Makefile | 2 + .../610-MIPS-ath79-openwrt-machines.patch | 18 ++- tools/firmware-utils/src/mktplinkfw.c | 6 + 10 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa7210n-v2.c 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 a4838d6..a83a4fc 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -298,6 +298,15 @@ tl-mr3420-v2) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" ;; +tl-wa7210n-v2) + ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" + ucidef_set_rssimon "wlan0" "40000" "1" + ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:signal1" "wlan0" "1" "100" "0" "13" + ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:signal2" "wlan0" "26" "100" "-25" "13" + ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:signal3" "wlan0" "51" "100" "-50" "13" + ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:signal4" "wlan0" "76" "100" "-75" "13" + ;; + tl-wa750re) ucidef_set_led_netdev "lan" "LAN" "tp-link:orange:lan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "tp-link:orange: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 efc212e..fdefb5a 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -325,6 +325,7 @@ tl-mr3020 |\ tl-mr3040 |\ tl-mr3040-v2 |\ tl-wa701nd-v2 |\ +tl-wa7210n-v2 |\ tl-wa750re |\ tl-wa850re |\ tl-wa830re-v2 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 6247f86..52acc6b 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -130,6 +130,9 @@ tplink_board_detect() { "075000"*) model="TP-Link TL-WA750RE" ;; + "721000"*) + model="TP-Link TL-WA7210N" + ;; "751000"*) model="TP-Link TL-WA7510N" ;; @@ -651,6 +654,9 @@ ar71xx_board_detect() { *"TL-WA701ND v2") name="tl-wa701nd-v2" ;; + *"TL-WA7210N v2") + name="tl-wa7210n-v2" + ;; *TL-WA750RE) name="tl-wa750re" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index f81c0ff..15fcf89 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -312,6 +312,7 @@ platform_check_image() { tl-mr3420 | \ tl-mr3420-v2 | \ tl-wa701nd-v2 | \ + tl-wa7210n-v2 | \ tl-wa7510n | \ tl-wa750re | \ tl-wa850re | \ diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18 index eefbf05..9386b4e 100644 --- a/target/linux/ar71xx/config-3.18 +++ b/target/linux/ar71xx/config-3.18 @@ -98,6 +98,7 @@ CONFIG_ATH79_MACH_TL_MR13U=y CONFIG_ATH79_MACH_TL_MR3020=y CONFIG_ATH79_MACH_TL_MR3X20=y CONFIG_ATH79_MACH_TL_WA701ND_V2=y +CONFIG_ATH79_MACH_TL_WA7210N_V2=y CONFIG_ATH79_MACH_TL_WA830RE_V2=y CONFIG_ATH79_MACH_TL_WA901ND=y CONFIG_ATH79_MACH_TL_WA901ND_V2=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa7210n-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa7210n-v2.c new file mode 100644 index 0000000..276353a --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa7210n-v2.c @@ -0,0 +1,125 @@ +/* + * TP-LINK TL-WA7210N v2.1 board support + * + * Copyright (C) 2011 dongyuqi <729650915@qq.com> + * Copyright (C) 2011-2012 Gabor Juhos + * Copyright (C) 2014 Nicolas Braud-Santoni + * Copyright (C) 2014 Alexander List + * Copyright (C) 2015 Hendrik Frenzel + * + * rebased on TL-WA7510Nv1 support, + * Copyright (C) 2012 Stefan Helmert + * + * 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 +#include + +#include "dev-dsa.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" +#include "pci.h" + +#include "common.h" + +#define TL_WA7210N_V2_GPIO_BTN_RESET 11 +#define TL_WA7210N_V2_KEYS_POLL_INT 20 +#define TL_WA7210N_V2_KEYS_DEBOUNCE_INT (3 * TL_WA7210N_V2_KEYS_POLL_INT) + +#define TL_WA7210N_V2_GPIO_LED_LAN 17 +#define TL_WA7210N_V2_GPIO_LED_SIG1 0 +#define TL_WA7210N_V2_GPIO_LED_SIG2 1 +#define TL_WA7210N_V2_GPIO_LED_SIG3 27 +#define TL_WA7210N_V2_GPIO_LED_SIG4 26 + +#define TL_WA7210N_V2_GPIO_LNA_EN 28 + +static const char *tl_wa7210n_v2_part_probes[] = { + "tp-link", + NULL, +}; + +static struct gpio_keys_button tl_wa7210n_v2_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WA7210N_V2_KEYS_DEBOUNCE_INT, + .gpio = TL_WA7210N_V2_GPIO_BTN_RESET, + .active_low = 0, + }, +}; + +static struct gpio_led tl_wa7210n_v2_leds_gpio[] __initdata = { + { + .name = "tp-link:green:lan", + .gpio = TL_WA7210N_V2_GPIO_LED_LAN, + .active_low = 1, + }, { + .name = "tp-link:green:signal1", + .gpio = TL_WA7210N_V2_GPIO_LED_SIG1, + .active_low = 0, + }, { + .name = "tp-link:green:signal2", + .gpio = TL_WA7210N_V2_GPIO_LED_SIG2, + .active_low = 0, + }, { + .name = "tp-link:green:signal3", + .gpio = TL_WA7210N_V2_GPIO_LED_SIG3, + .active_low = 1, + }, { + .name = "tp-link:green:signal4", + .gpio = TL_WA7210N_V2_GPIO_LED_SIG4, + .active_low = 1, + }, +}; + +static struct flash_platform_data tl_wa7210n_v2_flash_data = { + .part_probes = tl_wa7210n_v2_part_probes, +}; + +static void __init tl_wa7210n_v2_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); + + ath79_register_gpio_keys_polled(-1, TL_WA7210N_V2_KEYS_POLL_INT, + ARRAY_SIZE(tl_wa7210n_v2_gpio_keys), + tl_wa7210n_v2_gpio_keys); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa7210n_v2_leds_gpio), + tl_wa7210n_v2_leds_gpio); + + ath79_gpio_function_enable(TL_WA7210N_V2_GPIO_LNA_EN); + + ath79_setup_ar933x_phy4_switch(false, false); + + ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1); + ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1); + + ath79_register_eth(0); + ath79_register_eth(1); + + ath79_register_mdio(0, 0x0); + + ath79_register_wmac(ee, mac); + + ath79_register_m25p80(&tl_wa7210n_v2_flash_data); + + ath79_register_pci(); +} + +MIPS_MACHINE(ATH79_MACH_TL_WA7210N_V2, "TL-WA7210N-v2", "TP-LINK TL-WA7210N v2", + tl_wa7210n_v2_setup); diff --git a/target/linux/ar71xx/generic/profiles/tp-link.mk b/target/linux/ar71xx/generic/profiles/tp-link.mk index 5922f67..0174a43 100644 --- a/target/linux/ar71xx/generic/profiles/tp-link.mk +++ b/target/linux/ar71xx/generic/profiles/tp-link.mk @@ -160,6 +160,16 @@ define Profile/TLWA701/Description endef $(eval $(call Profile,TLWA701)) +define Profile/TLWA7210 + NAME:=TP-LINK TL-WA7210N + PACKAGES:=rssileds kmod-ledtrig-netdev +endef + +define Profile/TLWA7210/Description + Package set optimized for the TP-LINK TL-WA7210N. +endef +$(eval $(call Profile,TLWA7210)) + define Profile/TLWA730RE NAME:=TP-LINK TL-WA730RE PACKAGES:= diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index c9af0d4..caab404 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -1394,6 +1394,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLMR3040V2,tl-mr3040-v2,TL-MR3040 $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLMR3220V2,tl-mr3220-v2,TL-MR3220-v2,ttyATH0,115200,0x32200002,1,4Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLMR3420V2,tl-mr3420-v2,TL-MR3420-v2,ttyS0,115200,0x34200002,1,4Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWA701NV2,tl-wa701nd-v2,TL-WA701ND-v2,ttyATH0,115200,0x07010002,1,4Mlzma)) +$(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWA7210NV2,tl-wa7210n-v2,TL-WA7210N-v2,ttyATH0,115200,0x72100002,1,4Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR703,tl-wr703n-v1,TL-WR703N,ttyATH0,115200,0x07030101,1,4Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR710,tl-wr710n-v1,TL-WR710N,ttyATH0,115200,0x07100001,1,8Mlzma)) $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR720NV3,tl-wr720n-v3,TL-WR720N-v3,ttyATH0,115200,0x07200103,1,4Mlzma)) @@ -1481,6 +1482,7 @@ $(eval $(call MultiProfile,TLMR3040,TLMR3040V1 TLMR3040V2)) $(eval $(call MultiProfile,TLMR3220,TLMR3220V1 TLMR3220V2)) $(eval $(call MultiProfile,TLMR3420,TLMR3420V1 TLMR3420V2)) $(eval $(call MultiProfile,TLWA701,TLWA701NV1 TLWA701NV2)) +$(eval $(call MultiProfile,TLWA7210,TLWA7210NV2)) $(eval $(call MultiProfile,TLWA730RE,TLWA730REV1)) $(eval $(call MultiProfile,TLWA801,TLWA801NV1 TLWA801NV2)) $(eval $(call MultiProfile,TLWA830,TLWA830RV1 TLWA830RV2)) 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 ce839f4..832df9e 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,188 @@ +@@ -16,22 +16,189 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, @@ -116,6 +116,7 @@ + ATH79_MACH_TL_MR3420_V2, /* TP-LINK TL-MR3420 v2 */ + ATH79_MACH_TL_WA701ND_V2, /* TP-LINK TL-WA701ND v2 */ + ATH79_MACH_TL_WA750RE, /* TP-LINK TL-WA750RE */ ++ ATH79_MACH_TL_WA7210N_V2, /* TP-LINK TL-WA7210N v2 */ + ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ + ATH79_MACH_TL_WA850RE, /* TP-LINK TL-WA850RE */ + ATH79_MACH_TL_WA860RE, /* TP-LINK TL-WA860RE */ @@ -262,7 +263,7 @@ config ATH79_MACH_AP121 bool "Atheros AP121 reference board" select SOC_AR933X -@@ -11,62 +75,960 @@ config ATH79_MACH_AP121 +@@ -11,62 +75,970 @@ config ATH79_MACH_AP121 select ATH79_DEV_M25P80 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -1006,6 +1007,16 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + select ATH79_DEV_WMAC ++ ++config ATH79_MACH_TL_WA7210N_V2 ++ bool "TP-LINK TL-WA7210N v2 support" ++ select SOC_AR724X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC -config ATH79_MACH_AP136 - bool "Atheros AP136/AP135 reference board" @@ -1371,7 +1382,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -38,9 +38,117 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,118 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # @@ -1447,6 +1458,7 @@ +obj-$(CONFIG_ATH79_MACH_TL_MR3X20) += mach-tl-mr3x20.o +obj-$(CONFIG_ATH79_MACH_TL_WAX50RE) += mach-tl-wax50re.o +obj-$(CONFIG_ATH79_MACH_TL_WA701ND_V2) += mach-tl-wa701nd-v2.o ++obj-$(CONFIG_ATH79_MACH_TL_WA7210N_V2) += mach-tl-wa7210n-v2.o +obj-$(CONFIG_ATH79_MACH_TL_WA830RE_V2) += mach-tl-wa830re-v2.o +obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o +obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 0a5e4c3..4817e58 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -41,6 +41,7 @@ #define HWID_TL_MR3420_V2 0x34200002 #define HWID_TL_WA701N_V1 0x07010001 #define HWID_TL_WA701N_V2 0x07010002 +#define HWID_TL_WA7210N_V2 0x72100002 #define HWID_TL_WA7510N_V1 0x75100001 #define HWID_TL_WA801ND_V1 0x08010001 #define HWID_TL_WA830RE_V1 0x08300010 @@ -260,6 +261,11 @@ static struct board_info boards[] = { .hw_rev = 1, .layout_id = "4Mlzma", }, { + .id = "TL-WA7210N", + .hw_id = HWID_TL_WA7210N_V2, + .hw_rev = 2, + .layout_id = "4Mlzma", + }, { .id = "TL-WA7510N", .hw_id = HWID_TL_WA7510N_V1, .hw_rev = 1,