Hi,
comments inline
On 10/02/2017 21:28, Filip Moc wrote:
> You can flash via u-boot tftp (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).
>
> v1->v2:
> - Fixed DEVICE_TITLE
> - Defined flash type as "w25q64" (but it's still being misdetected as
> "s25fl064k")
>
>
> From 21e3a97f4b0180e37bca2c809b5a2181e02b050d Mon Sep 17 00:00:00 2001
> From: Filip Moc <l...@moc6.cz>
> Date: Fri, 10 Feb 2017 19:01:42 +0100
> Subject: [PATCH] ar71xx: Add support for TP-Link MR6400
why is there an additional mail header here ?
>
> Signed-off-by: Filip Moc <l...@moc6.cz>
> ---
> 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 +
> .../linux/ar71xx/base-files/etc/init.d/enablemodem | 17 +++
> 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 | 163
> +++++++++++++++++++++
> .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 +
> target/linux/ar71xx/image/tp-link.mk | 11 ++
> 12 files changed, 225 insertions(+)
> create mode 100755 target/linux/ar71xx/base-files/etc/init.d/enablemodem
> 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 b1ecb02..df9fbb9 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
> +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
> @@ -542,6 +542,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 f01e1bb..9997f51 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
> +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
> @@ -291,6 +291,11 @@ ar71xx_setup_interfaces()
> ucidef_add_switch "switch0" \
> "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1"
> ;;
> + 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 edcf621..81f7b49 100644
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -339,6 +339,9 @@ get_status_led() {
> tl-wa860re)
> status_led="tp-link:green:power"
> ;;
> + tl-mr6400)
> + status_led="tp-link:white:power"
> + ;;
bad ordering 3 < 6
> tl-mr3220|\
> tl-mr3220-v2|\
> tl-mr3420|\
> diff --git a/target/linux/ar71xx/base-files/etc/init.d/enablemodem
> b/target/linux/ar71xx/base-files/etc/init.d/enablemodem
> new file mode 100755
> index 0000000..0ec07c7
> --- /dev/null
> +++ b/target/linux/ar71xx/base-files/etc/init.d/enablemodem
> @@ -0,0 +1,17 @@
> +#!/bin/sh /etc/rc.common
> +
> +START=99
> +
> +start() {
> + . /lib/ar71xx.sh
> +
> + local board=$(ar71xx_board_name)
> + if [ $board = "tl-mr6400" ]; then
> + adb wait-for-device
> + adb shell chmod +x /WEBSERVER/www/cgi-bin/*
> + adb shell httpd -h /WEBSERVER/www/ &
> + echo "2357 000d" > /sys/bus/usb-serial/drivers/option1/new_id
> + sleep 2
> + adb kill-server
> + fi
> +}
please dont add this file just to remove it again in the follow up patch
> diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> index 3ca2c0d..f39a35c 100755
> --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> @@ -294,6 +294,9 @@ tplink_board_detect() {
> "342000"*)
> model="TP-Link TL-MR3420"
> ;;
> + "640000"*)
> + model="TP-Link TL-MR6400"
> + ;;
bad ordering 3 < 6
rest looks fine
John
> "332000"*)
> model="TP-Link TL-WDR3320"
> ;;
> @@ -971,6 +974,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 cf2aab2..0c7108d 100755
> --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> @@ -393,6 +393,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 8ba0c2a..048580c 100644
> --- a/target/linux/ar71xx/config-4.4
> +++ b/target/linux/ar71xx/config-4.4
> @@ -167,6 +167,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 8b6554c..e79bb6a 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
> @@ -1336,6 +1336,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 e9d69a4..3457eab 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
> @@ -171,6 +171,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..f1bf484
> --- /dev/null
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr6400.c
> @@ -0,0 +1,163 @@
> +/*
> + * TP-LINK TL-MR6400 board support
> + *
> + * Copyright (C) 2017 Filip Moc <l...@moc6.cz>
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are
> met:
> + * * Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * * Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + * * 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, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
> + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> TO,
> + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> PROFITS;
> + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
huge disclaimer, can you not just use gplv2 ?
> +#include <linux/gpio.h>
> +#include <linux/platform_device.h>
> +
> +#include <asm/mach-ath79/ar71xx_regs.h>
> +
> +#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 12e81db..e8452d5 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
> @@ -194,6 +194,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 4d95f48..4883162 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
>
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
