From 2fc7c3ef538ab35ae16afad722fe083498c8964d Mon Sep 17 00:00:00 2001 From: imbrolla <2664456645@qq.com> Date: Tue, 14 Nov 2017 03:48:39 +0800 Subject: [PATCH] add tl-wr842 v9 and tl-wr882 v1 --- .../ar71xx/base-files/etc/board.d/01_leds | 9 ++ .../ar71xx/base-files/etc/board.d/02_network | 2 + target/linux/ar71xx/base-files/etc/diag.sh | 4 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 6 + .../ar71xx/base-files/lib/upgrade/platform.sh | 2 + target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/config-4.9 | 1 + .../files/arch/mips/ath79/Kconfig.openwrt | 10 ++ .../ar71xx/files/arch/mips/ath79/Makefile | 1 + .../files/arch/mips/ath79/mach-tl-wr841n-v9.c | 104 +++++++++++++++++- .../ar71xx/files/arch/mips/ath79/machtypes.h | 2 + target/linux/ar71xx/image/tp-link.mk | 19 ++++ 12 files changed, 159 insertions(+), 2 deletions(-) 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 58b8cf2052..4b845404f6 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -745,6 +745,7 @@ tl-wpa8630) tl-wr740n-v6|\ tl-wr841n-v9|\ tl-wr841n-v11|\ +tl-wr842n-v9|\ tl-wr842n-v3) ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" @@ -754,6 +755,7 @@ tl-wr842n-v3) ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" case "$board" in + tl-wr842n-v9|\ tl-wr842n-v3) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1" ;; @@ -813,6 +815,13 @@ tl-wr2543n) ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:green:wlan2g" "phy0tpt" ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1" ;; +tl-wr882n-v1) + ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1" + ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" + ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08" + ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" + ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" + ;; tube2h) ucidef_set_led_netdev "lan" "LAN" "alfa:blue: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 abbcbdf9bf..397fcb06f8 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -49,6 +49,8 @@ ar71xx_setup_interfaces() tl-wr841n-v11|\ tl-wr841n-v9|\ tl-wr842n-v3|\ + tl-wr842n-v9|\ + tl-wr882n-v1|\ whr-g301n|\ whr-hp-g300n|\ whr-hp-gn|\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 0402868302..1bfc07b4a4 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -413,6 +413,7 @@ get_status_led() { tl-wa830re-v2|\ tl-wr842n-v2|\ tl-wr842n-v3|\ + tl-wr842n-v9|\ tl-wr941nd|\ tl-wr941n-v7|\ tl-wr941nd-v5) @@ -437,6 +438,9 @@ get_status_led() { tl-wr841n-v9) status_led="tp-link:green:qss" ;; + tl-wr882n-v1) + status_led="tp-link:white:status" + ;; tl-wr2543n) status_led="tp-link:green:wps" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 0186ba7b98..9b5c5fbff6 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -1190,6 +1190,12 @@ ar71xx_board_detect() { *"TL-WR842N/ND v3") name="tl-wr842n-v3" ;; + *"TL-WR842N/ND v9") + name="tl-wr842n-v9" + ;; + *"TL-WR882N v1") + name="tl-wr882n-v1" + ;; *"TL-WR902AC v1") name="tl-wr902ac-v1" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index a59b3e4f86..632b61cbaf 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -452,6 +452,8 @@ platform_check_image() { tl-wr841n-v9|\ tl-wr842n-v2|\ tl-wr842n-v3|\ + tl-wr842n-v9|\ + tl-wr882n-v1|\ tl-wr902ac-v1|\ tl-wr941nd-v5|\ tl-wr941nd-v6|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index cd98611094..fd77853f8a 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -214,6 +214,7 @@ CONFIG_ATH79_MACH_TL_WR840N_V2=y CONFIG_ATH79_MACH_TL_WR841N_V1=y CONFIG_ATH79_MACH_TL_WR841N_V8=y CONFIG_ATH79_MACH_TL_WR841N_V9=y +CONFIG_ATH79_MACH_TL_WR882N_V1=y CONFIG_ATH79_MACH_TL_WR902AC_V1=y CONFIG_ATH79_MACH_TL_WR940N_V4=y CONFIG_ATH79_MACH_TL_WR941ND=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index b5359e3e8c..c07be1dc95 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -212,6 +212,7 @@ CONFIG_ATH79_MACH_TL_WR840N_V2=y CONFIG_ATH79_MACH_TL_WR841N_V1=y CONFIG_ATH79_MACH_TL_WR841N_V8=y CONFIG_ATH79_MACH_TL_WR841N_V9=y +CONFIG_ATH79_MACH_TL_WR882N_V1=y CONFIG_ATH79_MACH_TL_WR902AC_V1=y CONFIG_ATH79_MACH_TL_WR940N_V4=y CONFIG_ATH79_MACH_TL_WR941ND=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 7244223132..be94fd0c8f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1739,6 +1739,16 @@ config ATH79_MACH_TL_WR841N_V9 select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_TL_WR882N_V1 + bool "TP-LINK TL-WR882N v1 support" + select SOC_QCA956X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + select ATH79_DEV_USB + config ATH79_MACH_TL_WR902AC_V1 bool "TP-LINK TL-WR902AC v1 support" select SOC_QCA953X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 04cb4faa0b..8ba3e8c6bb 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -221,6 +221,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WR840N_V2) += mach-tl-wr841n-v9.o obj-$(CONFIG_ATH79_MACH_TL_WR841N_V1) += mach-tl-wr841n.o obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8) += mach-tl-wr841n-v8.o obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9) += mach-tl-wr841n-v9.o +obj-$(CONFIG_ATH79_MACH_TL_WR882N_V1) += mach-tl-wr882n-v1.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 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c index 304d8ff6e9..318c0ce4ca 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c @@ -73,6 +73,17 @@ #define TL_WR842NV3_GPIO_BTN_RESET 1 #define TL_WR842NV3_GPIO_BTN_WIFI 0 +#define TL_WR842NV9_GPIO_LED_WLAN 12 +#define TL_WR842NV9_GPIO_LED_QSS 3 +#define TL_WR842NV9_GPIO_LED_WAN 11 +#define TL_WR842NV9_GPIO_LED_LAN1 16 +#define TL_WR842NV9_GPIO_LED_LAN2 15 +#define TL_WR842NV9_GPIO_LED_LAN3 14 +#define TL_WR842NV9_GPIO_LED_LAN4 4 +#define TL_WR842NV9_GPIO_LED_SYSTEM 13 +#define TL_WR842NV9_GPIO_BTN_RESET 17 +#define TL_WR842NV9_GPIO_BTN_WIFI 0 + #define TL_WR740NV6_GPIO_LED_SYSTEM 1 #define TL_WR740NV6_GPIO_LED_QSS 3 #define TL_WR740NV6_GPIO_LED_WAN_ORANGE 2 @@ -343,15 +354,59 @@ static struct gpio_keys_button tl_wr740n_v6_gpio_keys[] __initdata = { } }; +static struct gpio_led tl_wr842n_v9_leds_gpio[] __initdata = { + { + .name = "tp-link:green:lan1", + .gpio = TL_WR842NV9_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "tp-link:green:lan2", + .gpio = TL_WR842NV9_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "tp-link:green:lan3", + .gpio = TL_WR842NV9_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "tp-link:green:lan4", + .gpio = TL_WR842NV9_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "tp-link:green:system", + .gpio = TL_WR842NV9_GPIO_LED_SYSTEM, + .active_low = 1, + }, { + .name = "tp-link:green:wan", + .gpio = TL_WR842NV9_GPIO_LED_WAN, + .active_low = 1, + }, { + .name = "tp-link:green:wlan", + .gpio = TL_WR842NV9_GPIO_LED_WLAN, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tl_wr842n_v9_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WR842NV9_GPIO_BTN_RESET, + .active_low = 1, + } +}; + static void __init tl_ap143_setup(void) { u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); u8 tmpmac[ETH_ALEN]; + ath79_register_usb(); ath79_register_m25p80(&tl_wr841n_v9_flash_data); - ath79_setup_ar933x_phy4_switch(false, false); + /*ath79_setup_ar933x_phy4_switch(false, false);*/ ath79_register_mdio(0, 0x0); @@ -435,7 +490,6 @@ static void __init tl_wr842n_v3_setup(void) ARRAY_SIZE(tl_wr842n_v3_gpio_keys), tl_wr842n_v3_gpio_keys); - ath79_register_usb(); } MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3", @@ -455,3 +509,49 @@ static void __init tl_wr740n_v6_setup(void) MIPS_MACHINE(ATH79_MACH_TL_WR740N_V6, "TL-WR740N-v6", "TP-LINK TL-WR740N/ND v6", tl_wr740n_v6_setup); + +static void __init tl_wr842n_v9_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); + u8 tmpmac[ETH_ALEN]; + ath79_register_usb(); + ath79_register_m25p80(&tl_wr841n_v9_flash_data); + + /*ath79_setup_ar933x_phy4_switch(false, false);*/ + + ath79_register_mdio(0, 0x0); + ath79_register_mdio(1, 0x0); + /* add by zcc */ + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP); + /* LAN */ + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; + ath79_eth1_data.duplex = DUPLEX_FULL; + ath79_eth1_data.speed = SPEED_1000; + ath79_switch_data.phy_poll_mask |= BIT(0); + ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0); + ath79_register_eth(1); + + /* WAN */ + ath79_switch_data.phy4_mii_en = 1; + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.duplex = DUPLEX_FULL; + ath79_eth0_data.speed = SPEED_100; + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1); + ath79_register_eth(0); + + ath79_init_mac(tmpmac, mac, 0); + ath79_register_wmac(ee, tmpmac); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v9_leds_gpio), + tl_wr842n_v9_leds_gpio); + + ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_wr842n_v9_gpio_keys), + tl_wr842n_v9_gpio_keys); + +} + +MIPS_MACHINE(ATH79_MACH_TL_WR842N_V9, "TL-WR842N-v9", "TP-LINK TL-WR842N/ND v9", + tl_wr842n_v9_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 982bde48a4..6016a72c13 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -268,6 +268,8 @@ enum ath79_mach_type { ATH79_MACH_TL_WR841N_V9, /* TP-LINK TL-WR841N/ND v9 */ ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */ ATH79_MACH_TL_WR842N_V3, /* TP-LINK TL-WR842N/ND v3 */ + ATH79_MACH_TL_WR842N_V9, /* TP-LINK TL-WR842N/ND v9 */ + ATH79_MACH_TL_WR882N_V1, /* TP-LINK TL-WR882N v1 */ ATH79_MACH_TL_WR902AC_V1, /* TP-LINK TL-WR902AC v1 */ ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */ diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 3dff3a7a1c..abfa4ec4a6 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -1141,3 +1141,22 @@ define Device/tl-wdr6500-v6 TPLINK_HEADER_VERSION := 2 endef TARGET_DEVICES += tl-wdr6500-v6 + +define Device/tl-wr842n-v9 + $(Device/tplink-8mlzma) + DEVICE_TITLE := TP-LINK TL-WR842N/ND v9 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport + BOARDNAME := TL-WR842N-v9 + DEVICE_PROFILE := TLWR842 + TPLINK_HWID := 0x08420009 +endef +TARGET_DEVICES += tl-wr842n-v9 + +define Device/tl-wr882n-v1 + $(Device/tplink-8mlzma) + DEVICE_TITLE := TP-LINK TL-WR882N v1 + BOARDNAME := TL-WR882N-v1 + DEVICE_PROFILE := TLWR882 + TPLINK_HWID := 0x08820001 +endef +TARGET_DEVICES += tl-wr882n-v1