[OpenWrt-Devel] [PATCH] ar71xx: add TP-LINK TL-WDR3320 v2 support

高惟杰 hackpascal at gmail.com
Tue Sep 15 05:16:23 EDT 2015


Oh, that's a mistake.

2015-09-15 4:03 GMT+08:00 John Crispin <blogic at openwrt.org>:

> Hi,
>
> On 09/09/2015 16:56, Weijie Gao wrote:
> > Signed-off-by: Weijie Gao <hackpascal at gmail.com>
>
> this line should be the last line and not the first, i manually fixed
> this during the merge
>
>         John
>
> >
> > This patch adds support for TP-LINK TL-WDR3320 v2.
> >
> > This router uses a chinese version 2 firmware header,.
> > ---
> >  target/linux/ar71xx/base-files/etc/diag.sh         |   1 +
> >  .../ar71xx/base-files/etc/uci-defaults/01_leds     |   4 +
> >  .../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-4.1                     |   1 +
> >  .../files/arch/mips/ath79/mach-tl-wdr3320-v2.c     | 146
> +++++++++++++++++++++
> >  target/linux/ar71xx/generic/profiles/tp-link.mk    |  11 ++
> >  target/linux/ar71xx/image/Makefile                 |  46 ++++++-
> >  .../816-MIPS-ath79-add-tl-wdr3320-v2-support.patch |  40 ++++++
> >  10 files changed, 256 insertions(+), 1 deletion(-)
> >  create mode 100644
> target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3320-v2.c
> >  create mode 100644
> target/linux/ar71xx/patches-4.1/816-MIPS-ath79-add-tl-wdr3320-v2-support.patch
> >
> > diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
> b/target/linux/ar71xx/base-files/etc/diag.sh
> > index 36de775..0dcc844 100644
> > --- a/target/linux/ar71xx/base-files/etc/diag.sh
> > +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> > @@ -256,6 +256,7 @@ get_status_led() {
> >       tl-wa901nd | \
> >       tl-wa901nd-v2 | \
> >       tl-wa901nd-v3 | \
> > +     tl-wdr3320-v2 | \
> >       tl-wdr3500 | \
> >       tl-wr1041n-v2 | \
> >       tl-wr1043nd | \
> > 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 e7f7a4c..4dafc1e 100644
> > --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> > +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> > @@ -425,6 +425,10 @@ tl-wa901nd-v2)
> >       ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
> >       ;;
> >
> > +tl-wdr3320-v2)
> > +     ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:green:wlan5g"
> "phy0tpt"
> > +     ;;
> > +
> >  tl-wdr3500)
> >       ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
> >       ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:green:wlan2g"
> "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 686fce9..37d5a63 100644
> > --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> > +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> > @@ -435,6 +435,7 @@ tew-712br |\
> >  tl-mr3220 |\
> >  tl-mr3220-v2 |\
> >  tl-mr3420 |\
> > +tl-wdr3320-v2 |\
> >  tl-wdr3500 |\
> >  tl-wr741nd |\
> >  tl-wr741nd-v4 |\
> > diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> > index e1f345e..c5440f9 100755
> > --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> > +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> > @@ -221,6 +221,9 @@ tplink_board_detect() {
> >       "342000"*)
> >               model="TP-Link TL-MR3420"
> >               ;;
> > +     "332000"*)
> > +             model="TP-Link TL-WDR3320"
> > +             ;;
> >       "350000"*)
> >               model="TP-Link TL-WDR3500"
> >               ;;
> > @@ -763,6 +766,9 @@ ar71xx_board_detect() {
> >       *"TL-WA901ND v3")
> >               name="tl-wa901nd-v3"
> >               ;;
> > +     *"TL-WDR3320 v2")
> > +             name="tl-wdr3320-v2"
> > +             ;;
> >       *"TL-WDR3500")
> >               name="tl-wdr3500"
> >               ;;
> > diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> > index c1962e4..1d56d99 100755
> > --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> > +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> > @@ -338,6 +338,7 @@ platform_check_image() {
> >       tl-wa901nd | \
> >       tl-wa901nd-v2 | \
> >       tl-wa901nd-v3 | \
> > +     tl-wdr3320-v2 | \
> >       tl-wdr3500 | \
> >       tl-wdr4300 | \
> >       tl-wdr4900-v2 | \
> > diff --git a/target/linux/ar71xx/config-4.1
> b/target/linux/ar71xx/config-4.1
> > index 21c4601..d0a6602 100644
> > --- a/target/linux/ar71xx/config-4.1
> > +++ b/target/linux/ar71xx/config-4.1
> > @@ -121,6 +121,7 @@ CONFIG_ATH79_MACH_TL_WA830RE_V2=y
> >  CONFIG_ATH79_MACH_TL_WA901ND=y
> >  CONFIG_ATH79_MACH_TL_WA901ND_V2=y
> >  CONFIG_ATH79_MACH_TL_WAX50RE=y
> > +CONFIG_ATH79_MACH_TL_WDR3320_V2=y
> >  CONFIG_ATH79_MACH_TL_WDR3500=y
> >  CONFIG_ATH79_MACH_TL_WDR4300=y
> >  CONFIG_ATH79_MACH_TL_WDR6500_V2=y
> > diff --git
> a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3320-v2.c
> b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3320-v2.c
> > new file mode 100644
> > index 0000000..3e452f2
> > --- /dev/null
> > +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr3320-v2.c
> > @@ -0,0 +1,146 @@
> > +/*
> > + *  TP-LINK TL-WDR3320 v2 board support
> > + *
> > + *  Copyright (C) 2012 Gabor Juhos <juhosg at openwrt.org>
> > + *  Copyright (C) 2015 Weijie Gao <hackpascal at 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
> > + *  by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/pci.h>
> > +#include <linux/phy.h>
> > +#include <linux/gpio.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/ath9k_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 WDR3320_GPIO_LED_WLAN5G              12
> > +#define WDR3320_GPIO_LED_SYSTEM              14
> > +#define WDR3320_GPIO_LED_QSS         15
> > +#define WDR3320_GPIO_LED_WAN         4
> > +#define WDR3320_GPIO_LED_LAN1                18
> > +#define WDR3320_GPIO_LED_LAN2                20
> > +#define WDR3320_GPIO_LED_LAN3                21
> > +#define WDR3320_GPIO_LED_LAN4                22
> > +
> > +#define WDR3320_GPIO_BTN_RESET               16
> > +
> > +#define WDR3320_KEYS_POLL_INTERVAL   20      /* msecs */
> > +#define WDR3320_KEYS_DEBOUNCE_INTERVAL       (3 *
> WDR3320_KEYS_POLL_INTERVAL)
> > +
> > +#define WDR3320_WMAC_CALDATA_OFFSET  0x1000
> > +#define WDR3320_PCIE_CALDATA_OFFSET  0x5000
> > +
> > +static const char *wdr3320_part_probes[] = {
> > +     "tp-link",
> > +     NULL,
> > +};
> > +
> > +static struct flash_platform_data wdr3320_flash_data = {
> > +     .part_probes    = wdr3320_part_probes,
> > +};
> > +
> > +static struct gpio_led wdr3320_leds_gpio[] __initdata = {
> > +     {
> > +             .name           = "tp-link:green:qss",
> > +             .gpio           = WDR3320_GPIO_LED_QSS,
> > +             .active_low     = 1,
> > +     },
> > +     {
> > +             .name           = "tp-link:green:system",
> > +             .gpio           = WDR3320_GPIO_LED_SYSTEM,
> > +             .active_low     = 1,
> > +     },
> > +     {
> > +             .name           = "tp-link:green:wlan5g",
> > +             .gpio           = WDR3320_GPIO_LED_WLAN5G,
> > +             .active_low     = 1,
> > +     },
> > +};
> > +
> > +static struct gpio_keys_button wdr3320_gpio_keys[] __initdata = {
> > +     {
> > +             .desc           = "reset",
> > +             .type           = EV_KEY,
> > +             .code           = KEY_RESTART,
> > +             .debounce_interval = WDR3320_KEYS_DEBOUNCE_INTERVAL,
> > +             .gpio           = WDR3320_GPIO_BTN_RESET,
> > +             .active_low     = 1,
> > +     },
> > +};
> > +
> > +static void __init wdr3320_setup(void)
> > +{
> > +     u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
> > +     u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
> > +     u8 tmpmac[ETH_ALEN];
> > +
> > +     ath79_register_m25p80(&wdr3320_flash_data);
> > +     ath79_register_leds_gpio(-1, ARRAY_SIZE(wdr3320_leds_gpio),
> > +                              wdr3320_leds_gpio);
> > +     ath79_register_gpio_keys_polled(-1, WDR3320_KEYS_POLL_INTERVAL,
> > +                                     ARRAY_SIZE(wdr3320_gpio_keys),
> > +                                     wdr3320_gpio_keys);
> > +
> > +     ath79_init_mac(tmpmac, mac, 0);
> > +     ath79_register_wmac(art + WDR3320_WMAC_CALDATA_OFFSET, tmpmac);
> > +
> > +     ath79_init_mac(tmpmac, mac, -1);
> > +     ap9x_pci_setup_wmac_led_pin(0, 0);
> > +     ap91_pci_init(art + WDR3320_PCIE_CALDATA_OFFSET, tmpmac);
> > +
> > +     ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
> > +
> > +     ath79_register_mdio(1, 0x0);
> > +
> > +     /* LAN */
> > +     ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
> > +
> > +     /* GMAC1 is connected to the internal switch */
> > +     ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
> > +
> > +     ath79_register_eth(1);
> > +
> > +     /* WAN */
> > +     ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
> > +
> > +     /* GMAC0 is connected to the PHY4 of the internal switch */
> > +     ath79_switch_data.phy4_mii_en = 1;
> > +     ath79_switch_data.phy_poll_mask = BIT(4);
> > +     ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
> > +     ath79_eth0_data.phy_mask = BIT(4);
> > +     ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
> > +
> > +     ath79_register_eth(0);
> > +
> > +     ath79_register_usb();
> > +
> > +     ath79_gpio_output_select(WDR3320_GPIO_LED_LAN1,
> > +                              AR934X_GPIO_OUT_LED_LINK0);
> > +     ath79_gpio_output_select(WDR3320_GPIO_LED_LAN2,
> > +                              AR934X_GPIO_OUT_LED_LINK1);
> > +     ath79_gpio_output_select(WDR3320_GPIO_LED_LAN3,
> > +                              AR934X_GPIO_OUT_LED_LINK2);
> > +     ath79_gpio_output_select(WDR3320_GPIO_LED_LAN4,
> > +                              AR934X_GPIO_OUT_LED_LINK3);
> > +     ath79_gpio_output_select(WDR3320_GPIO_LED_WAN,
> > +                              AR934X_GPIO_OUT_LED_LINK4);
> > +}
> > +
> > +MIPS_MACHINE(ATH79_MACH_TL_WDR3320_V2, "TL-WDR3320-v2",
> > +          "TP-LINK TL-WDR3320 v2",
> > +          wdr3320_setup);
> > diff --git a/target/linux/ar71xx/generic/profiles/tp-link.mk
> b/target/linux/ar71xx/generic/profiles/tp-link.mk
> > index 05d1019..2875290 100644
> > --- a/target/linux/ar71xx/generic/profiles/tp-link.mk
> > +++ b/target/linux/ar71xx/generic/profiles/tp-link.mk
> > @@ -266,6 +266,17 @@ endef
> >  $(eval $(call Profile,TLWDR4300))
> >
> >
> > +define Profile/TLWDR3320V2
> > +     NAME:=TP-LINK TL-WDR3320v2
> > +     PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
> > +endef
> > +
> > +define Profile/TLWDR3320V2/Description
> > +     Package set optimized for the TP-LINK TL-WDR3320v2.
> > +endef
> > +$(eval $(call Profile,TLWDR3320V2))
> > +
> > +
> >  define Profile/TLWDR4900V2
> >       NAME:=TP-LINK TL-WDR4900v2
> >       PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
> > diff --git a/target/linux/ar71xx/image/Makefile
> b/target/linux/ar71xx/image/Makefile
> > index e6fe36a..1036399 100644
> > --- a/target/linux/ar71xx/image/Makefile
> > +++ b/target/linux/ar71xx/image/Makefile
> > @@ -53,6 +53,17 @@ define Build/mktplinkfw
> >               $(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm
> -f $@
> >  endef
> >
> > +define Build/mktplinkfw-chn-v2
> > +     -$(STAGING_DIR_HOST)/bin/mktplinkfw \
> > +             -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F
> $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) -m 2 \
> > +             -k $(word 1,$^) \
> > +             -r $@ \
> > +             -o $@.new \
> > +             -j -X 0x40000 \
> > +             -a $(call rootfs_align,$(FILESYSTEM)) \
> > +             $(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm
> -f $@
> > +endef
> > +
> >  # -c combined image
> >  define Build/mktplinkfw-initramfs
> >       $(STAGING_DIR_HOST)/bin/mktplinkfw \
> > @@ -64,6 +75,16 @@ define Build/mktplinkfw-initramfs
> >       @mv $@.new $@
> >  endef
> >
> > +define Build/mktplinkfw-initramfs-chn-v2
> > +     $(STAGING_DIR_HOST)/bin/mktplinkfw \
> > +             -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F
> $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) -m 2 \
> > +             -k $@ \
> > +             -o $@.new \
> > +             -s -S \
> > +             -c
> > +     @mv $@.new $@
> > +endef
> > +
> >  define Build/loader-common
> >       rm -rf $@.src
> >       $(MAKE) -C lzma-loader \
> > @@ -235,6 +256,15 @@ define Device/tplink
> >    IMAGE/factory.bin := append-rootfs | mktplinkfw factory
> >  endef
> >
> > +define Device/tplink-chn-v2
> > +  TPLINK_HWREV := 0x1
> > +  KERNEL := kernel-bin | patch-cmdline | lzma
> > +  KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma |
> mktplinkfw-initramfs-chn-v2
> > +  IMAGES := sysupgrade.bin factory.bin
> > +  IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw-chn-v2 sysupgrade
> > +  IMAGE/factory.bin := append-rootfs | mktplinkfw-chn-v2 factory
> > +endef
> > +
> >  define Device/tplink-nolzma
> >  $(Device/tplink)
> >    LOADER_FLASH_OFFS := 0x22000
> > @@ -274,6 +304,12 @@ $(Device/tplink)
> >    IMAGE_SIZE := 15872k
> >  endef
> >
> > +define Device/tplink-chn-v2-4mlzma
> > +$(Device/tplink-chn-v2)
> > +  TPLINK_FLASHLAYOUT := 4Mlzma
> > +  IMAGE_SIZE := 3904k
> > +endef
> > +
> >  define Device/tl-wdr4300-v1
> >  $(Device/tplink-8mlzma)
> >    BOARDNAME = TL-WDR4300
> > @@ -306,7 +342,15 @@ define Device/mw4530r-v1
> >  $(Device/tl-wdr4300-v1)
> >    TPLINK_HWID := 0x45300001
> >  endef
> > -TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1
> tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1
> > +
> > +define Device/tl-wdr3320-v2
> > +$(Device/tplink-chn-v2-4mlzma)
> > +  BOARDNAME = TL-WDR3320-v2
> > +  DEVICE_PROFILE = TLWDR3320V2
> > +  TPLINK_HWID := 0x33200002
> > +endef
> > +
> > +TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1
> tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1 tl-wdr3320-v2
> >
> >  define Device/archer-c5
> >      $(Device/tplink-16mlzma)
> > diff --git
> a/target/linux/ar71xx/patches-4.1/816-MIPS-ath79-add-tl-wdr3320-v2-support.patch
> b/target/linux/ar71xx/patches-4.1/816-MIPS-ath79-add-tl-wdr3320-v2-support.patch
> > new file mode 100644
> > index 0000000..8d6d686
> > --- /dev/null
> > +++
> b/target/linux/ar71xx/patches-4.1/816-MIPS-ath79-add-tl-wdr3320-v2-support.patch
> > @@ -0,0 +1,40 @@
> > +--- a/arch/mips/ath79/Kconfig
> > ++++ b/arch/mips/ath79/Kconfig
> > +@@ -1031,6 +1031,17 @@
> > +     select ATH79_DEV_M25P80
> > +     select ATH79_DEV_WMAC
> > +
> > ++config ATH79_MACH_TL_WDR3320_V2
> > ++    bool "TP-LINK TL-WDR3320 v2 board support"
> > ++    select SOC_AR934X
> > ++    select ATH79_DEV_AP9X_PCI if PCI
> > ++    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_WDR3500
> > +     bool "TP-LINK TL-WDR3500 board support"
> > +     select SOC_AR934X
> > +--- a/arch/mips/ath79/machtypes.h
> > ++++ b/arch/mips/ath79/machtypes.h
> > +@@ -152,6 +152,7 @@
> > +     ATH79_MACH_TL_WA901ND,          /* TP-LINK TL-WA901ND */
> > +     ATH79_MACH_TL_WA901ND_V2,       /* TP-LINK TL-WA901ND v2 */
> > +     ATH79_MACH_TL_WA901ND_V3,       /* TP-LINK TL-WA901ND v3 */
> > ++    ATH79_MACH_TL_WDR3320_V2,       /* TP-LINK TL-WDR3320 v2 */
> > +     ATH79_MACH_TL_WDR3500,          /* TP-LINK TL-WDR3500 */
> > +     ATH79_MACH_TL_WDR4300,          /* TP-LINK TL-WDR4300 */
> > +     ATH79_MACH_TL_WDR6500_V2,       /* TP-LINK TL-WDR6500 v2 */
> > +--- a/arch/mips/ath79/Makefile
> > ++++ b/arch/mips/ath79/Makefile
> > +@@ -128,6 +128,7 @@
> > + 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
> > ++obj-$(CONFIG_ATH79_MACH_TL_WDR3320_V2)  += mach-tl-wdr3320-v2.o
> > + obj-$(CONFIG_ATH79_MACH_TL_WDR3500)     += mach-tl-wdr3500.o
> > + obj-$(CONFIG_ATH79_MACH_TL_WDR4300)     += mach-tl-wdr4300.o
> > + obj-$(CONFIG_ATH79_MACH_TL_WDR6500_V2)  += mach-tl-wdr6500-v2.o
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20150915/68fe2807/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list