From patchwork Thu Mar 9 22:25:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filip Moc X-Patchwork-Id: 737166 X-Patchwork-Delegate: pepe2k@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vfQnn2LVbz9s7c for ; Fri, 10 Mar 2017 09:59:41 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Mle6Vyx/"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:In-Reply-To:MIME-Version: References:Message-ID:To:From:Date:Reply-To:Cc:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=l6T1LUwvbB0I6SGZEDROK5l4jDnBgYawrtX/mWhLVss=; b=Mle6Vyx/76BJCo Vq7J84GgJkfjM7veqbEsImnK6vV5jrCbvkdGrbKZ028zkVr/Aese8kYV8YrhHFR4EMM1WMs9GNjzE LKH6mbfeEqIan1sW2y4NuKWGHIxgp8wyyeZjTwcKz4YNRsyBP8JFrAEEbvoMn8s6oxGlpSCvNpslc LUySW9IL+3AuJd0n/9Ce2N0gokuLykctizwHgLyL0+5qEO8PUBjClS/YnZm0RAMBi/xk2PLDHgGbG 9EgdJb7pzxQ15tqT6S1FfD7vNG9AQXadhMlgPVaoisv8WwehmdJsYQeZwW7bkfxY9QAYmLSB6R/e/ zuV1lVvLuwCk8j0vbXMQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cm6X7-0008ME-SX; Thu, 09 Mar 2017 22:27:41 +0000 Received: from [2a02:768:2100:966:250:fcff:feb6:91f7] (helo=moc6.cz) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cm6W1-0008KB-Ob for lede-dev@lists.infradead.org; Thu, 09 Mar 2017 22:26:39 +0000 Received: by moc6.cz (Postfix, from userid 1025) id 38FDD23225DD; Thu, 9 Mar 2017 23:25:16 +0100 (CET) Date: Thu, 9 Mar 2017 23:25:16 +0100 From: Filip Moc To: lede-dev@lists.infradead.org Message-ID: <20170309222516.GA32314@moc6.cz> References: <20170204135426.GA30610@moc6.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170204135426.GA30610@moc6.cz> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170309_142634_165943_DDB228DF X-CRM114-Status: GOOD ( 14.90 ) X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Subject: [LEDE-DEV] [PATCH v4 1/2] ar71xx: Add support for TP-Link MR6400 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org You can flash via tftp recovery (serve factory image as /mr6400_tp_recovery.bin on 192.168.0.66/24, connect to any ethernet port and power on device while holding the reset button). Flashing via OEM web interface does not work. Hardware Specification (v1.0 EU): - SoC: QCA9531 - Flash: Winbond W25Q64FV (8MiB) - RAM: EtronTech EM6AB160TSE-5G (64MiB) - Wireless: SoC platform only (2.4GHz b/g/n, 2x internal antenna) - Ethernet: 2NIC (3x100M + 1x100M) - WWAN: TP-LINK LTE MODULE (2x external detachable antenna) - Power: DC 12V 1A Signed-off-by: Filip Moc --- Notes: v1->v2: - Fixed DEVICE_TITLE - Defined flash type as "w25q64" (but it's still being misdetected as "s25fl064k") v2->v3: - Removed enablemodem - Changed license of mach-tl-mr6400.c v3->v4: - Updated commit message target/linux/ar71xx/base-files/etc/board.d/01_leds | 6 + .../linux/ar71xx/base-files/etc/board.d/02_network | 5 + target/linux/ar71xx/base-files/etc/diag.sh | 3 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 6 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.4 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 10 ++ target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c | 151 +++++++++++++++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/tp-link.mk | 11 ++ 11 files changed, 196 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c 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 4dc4bfd..4d6c5c9 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -576,6 +576,12 @@ tl-wr941nd-v5) ;; esac ;; +tl-mr6400) + ucidef_set_led_netdev "lan" "LAN" "tp-link:white:lan" "eth0" + ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1" + ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:white:wlan" "phy0tpt" + ;; tl-wa7210n-v2) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" ucidef_set_rssimon "wlan0" "200000" "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 e08d7dd..e2489aa 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -307,6 +307,11 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" ;; + tl-mr6400) + ucidef_set_interfaces_lan_wan "eth0 eth1" "usb0" + ucidef_add_switch "switch0" \ + "0@eth0" "1:lan" "2:lan" "3:lan" + ;; dir-825-b1|\ nbg460n_550n_550nh|\ tew-673gru|\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 1064641..0916fa0 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -354,6 +354,9 @@ get_status_led() { tl-wa860re) status_led="tp-link:green:power" ;; + tl-mr6400) + status_led="tp-link:white:power" + ;; tl-mr3220|\ tl-mr3220-v2|\ tl-mr3420|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index ae0189d..4ce6918 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -298,6 +298,9 @@ tplink_board_detect() { "342000"*) model="TP-Link TL-MR3420" ;; + "640000"*) + model="TP-Link TL-MR6400" + ;; "332000"*) model="TP-Link TL-WDR3320" ;; @@ -1002,6 +1005,9 @@ ar71xx_board_detect() { *"TL-MR3420 v2") name="tl-mr3420-v2" ;; + *TL-MR6400) + name="tl-mr6400" + ;; *"TL-WA701ND v2") name="tl-wa701nd-v2" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 576ff6c..6134604 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -394,6 +394,7 @@ platform_check_image() { tl-mr3220|\ tl-mr3420-v2|\ tl-mr3420|\ + tl-mr6400|\ tl-wa701nd-v2|\ tl-wa7210n-v2|\ tl-wa750re|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 206ace6..6c70091 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -169,6 +169,7 @@ CONFIG_ATH79_MACH_TL_MR11U=y CONFIG_ATH79_MACH_TL_MR13U=y CONFIG_ATH79_MACH_TL_MR3020=y CONFIG_ATH79_MACH_TL_MR3X20=y +CONFIG_ATH79_MACH_TL_MR6400=y CONFIG_ATH79_MACH_TL_WA701ND_V2=y CONFIG_ATH79_MACH_TL_WA7210N_V2=y CONFIG_ATH79_MACH_TL_WA801ND_V3=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 514d05d..aaec03c 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1358,6 +1358,16 @@ config ATH79_MACH_TL_MR3X20 select ATH79_DEV_M25P80 select ATH79_DEV_USB +config ATH79_MACH_TL_MR6400 + bool "TP-LINK TL-MR6400 support" + select SOC_QCA953X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + select ATH79_DEV_WMAC + config ATH79_MACH_TL_WAX50RE bool "TP-LINK TL-WA750/850RE support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 6475259..ef2dc40 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -174,6 +174,7 @@ obj-$(CONFIG_ATH79_MACH_TL_MR11U) += mach-tl-mr11u.o obj-$(CONFIG_ATH79_MACH_TL_MR13U) += mach-tl-mr13u.o obj-$(CONFIG_ATH79_MACH_TL_MR3020) += mach-tl-mr3020.o obj-$(CONFIG_ATH79_MACH_TL_MR3X20) += mach-tl-mr3x20.o +obj-$(CONFIG_ATH79_MACH_TL_MR6400) += mach-tl-mr6400.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_WA801ND_V3) += mach-tl-wa801nd-v3.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c new file mode 100644 index 0000000..be49c89 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c @@ -0,0 +1,151 @@ +/* + * TP-LINK TL-MR6400 board support + * + * Copyright (C) 2017 Filip Moc + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE. + */ + +#include +#include + +#include + +#include "common.h" +#include "dev-gpio-buttons.h" +#include "dev-eth.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define TL_MR6400_GPIO_LTE_POWER 4 +#define TL_MR6400_GPIO_BTN_RESET 12 /* SW2 */ +#define TL_MR6400_GPIO_BTN_RFKILL 14 /* SW3 */ +#define TL_MR6400_GPIO_LED_WAN 0 /* D12 */ +#define TL_MR6400_GPIO_LED_4G 1 /* D11 */ +#define TL_MR6400_GPIO_LED_WPS 3 /* D5 */ +#define TL_MR6400_GPIO_LED_WLAN 11 /* D3 */ +#define TL_MR6400_GPIO_LED_POWER 13 /* D2 */ +#define TL_MR6400_GPIO_LED_LAN 16 /* D4 */ + +#define TL_MR6400_KEYS_POLL_INTERVAL 20 /* msecs */ +#define TL_MR6400_KEYS_DEBOUNCE_INTERVAL (3 * TL_MR6400_KEYS_POLL_INTERVAL) + +#define TL_MR6400_WMAC_CALDATA_OFFSET 0x1000 + +static const char *tl_mr6400_part_probes[] = { + "tp-link", + NULL, +}; + +static struct flash_platform_data tl_mr6400_flash_data = { + .part_probes = tl_mr6400_part_probes, + .type = "w25q64", +}; + +static struct gpio_led tl_mr6400_leds_gpio[] __initdata = { + { + .name = "tp-link:white:wan", + .gpio = TL_MR6400_GPIO_LED_WAN, + .active_low = 0, + }, + { + .name = "tp-link:white:4g", + .gpio = TL_MR6400_GPIO_LED_4G, + .active_low = 0, + }, + { + .name = "tp-link:white:wps", + .gpio = TL_MR6400_GPIO_LED_WPS, + .active_low = 0, + }, + { + .name = "tp-link:white:wlan", + .gpio = TL_MR6400_GPIO_LED_WLAN, + .active_low = 0, + }, + { + .name = "tp-link:white:power", + .gpio = TL_MR6400_GPIO_LED_POWER, + .active_low = 0, + }, + { + .name = "tp-link:white:lan", + .gpio = TL_MR6400_GPIO_LED_LAN, + .active_low = 0, + }, +}; + +static struct gpio_keys_button tl_mr6400_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_MR6400_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_MR6400_GPIO_BTN_RESET, + .active_low = 1, + }, + { + .desc = "rfkill", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = TL_MR6400_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_MR6400_GPIO_BTN_RFKILL, + .active_low = 1, + }, +}; + +static void __init tl_mr6400_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + ath79_register_m25p80(&tl_mr6400_flash_data); + + ath79_register_mdio(0, 0x0); + + /* LAN1, LAN2, LAN3 */ + ath79_switch_data.phy4_mii_en = 1; + ath79_switch_data.phy_poll_mask |= BIT(0); + ath79_eth1_data.duplex = DUPLEX_FULL; + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; + ath79_eth1_data.speed = SPEED_1000; + ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1); + ath79_register_eth(1); + + /* LAN4 / WAN */ + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.duplex = DUPLEX_FULL; + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; + ath79_eth0_data.speed = SPEED_100; + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1); + ath79_register_eth(0); + + ath79_register_wmac(art + TL_MR6400_WMAC_CALDATA_OFFSET, mac); + + ath79_register_leds_gpio(-1, + ARRAY_SIZE(tl_mr6400_leds_gpio), + tl_mr6400_leds_gpio); + + ath79_register_gpio_keys_polled(-1, + TL_MR6400_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_mr6400_gpio_keys), + tl_mr6400_gpio_keys); + + gpio_request_one(TL_MR6400_GPIO_LTE_POWER, + GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED | GPIOF_ACTIVE_LOW, + "LTE power"); + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_TL_MR6400, "TL-MR6400", "TP-LINK TL-MR6400", + tl_mr6400_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 4cad628..e89ece1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -206,6 +206,7 @@ enum ath79_mach_type { ATH79_MACH_TL_MR3220_V2, /* TP-LINK TL-MR3220 v2 */ ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ ATH79_MACH_TL_MR3420_V2, /* TP-LINK TL-MR3420 v2 */ + ATH79_MACH_TL_MR6400, /* TP-LINK TL-MR6400 */ ATH79_MACH_TL_WA701ND_V2, /* TP-LINK TL-WA701ND v2 */ ATH79_MACH_TL_WA7210N_V2, /* TP-LINK TL-WA7210N v2 */ ATH79_MACH_TL_WA750RE, /* TP-LINK TL-WA750RE */ diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index b251135..2a0b06a 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -452,6 +452,17 @@ define Device/tl-mr3420-v2 endef TARGET_DEVICES += tl-mr3020-v1 tl-mr3040-v1 tl-mr3040-v2 tl-mr3220-v1 tl-mr3220-v2 tl-mr3420-v1 tl-mr3420-v2 +define Device/tl-mr6400-v1 + $(Device/tplink-8mlzma) + DEVICE_TITLE := TP-LINK TL-MR6400 v1 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb + BOARDNAME := TL-MR6400 + DEVICE_PROFILE := TLMR6400 + TPLINK_HWID := 0x64000001 +endef +TARGET_DEVICES += tl-mr6400-v1 + + define Device/tl-wpa8630 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WPA8630