diff options
12 files changed, 338 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 0694fe9..27e6c8a 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -58,7 +58,8 @@ sc1750|\ sc450) ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt" ;; -archer-c25-v1) +archer-c25-v1|\ +archer-c7-v4) ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt" ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt" @@ -66,6 +67,12 @@ archer-c25-v1) ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08" ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04" ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02" + case "$board" in + archer-c7-v4) + ucidef_set_led_usbdev "usb1" "USB1" "$board:green:usb1" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "$board:green:usb2" "2-1" + ;; + esac ;; archer-c58-v1|\ archer-c59-v1|\ 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 46b2171..a75f5fe 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -428,6 +428,7 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3" ;; + archer-c7-v4|\ tl-wdr4300|\ tl-wr1041n-v2) ucidef_add_switch "switch0" \ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 7fa4ff0..f4ad435 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -58,6 +58,7 @@ get_status_led() { archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ + archer-c7-v4|\ fritz300e|\ gl-usb150|\ mr12|\ diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 9a5f82b..6679659 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -54,6 +54,7 @@ case "$FIRMWARE" in ath10kcal_extract "ART" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; + archer-c7-v4|\ archer-c25-v1|\ archer-c59-v1|\ archer-c60-v1|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 9298451..f89c009 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -452,6 +452,9 @@ ar71xx_board_detect() { *"Archer C5") name="archer-c5" ;; + *"Archer C7 v4") + name="archer-c7-v4" + ;; *"Archer C58 v1") name="archer-c58-v1" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 97d5601..3d6d9ed 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -211,6 +211,7 @@ platform_check_image() { archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ + archer-c7-v4|\ bullet-m|\ c-55|\ carambola2|\ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 0b5bae6..5cb4f7e 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1393,6 +1393,7 @@ config ATH79_MACH_ARCHER_C60_V1 config ATH79_MACH_ARCHER_C7 bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support" select SOC_QCA955X + select SOC_QCA956X select ATH79_DEV_AP9X_PCI if PCI select ATH79_DEV_ETH select ATH79_DEV_GPIO_BUTTONS diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index a8d9dda..7d12282 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_ATH79_MACH_ARCHER_C58_V1) += mach-archer-c59-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C59_V1) += mach-archer-c59-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C60_V1) += mach-archer-c60-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7.o +obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7-v4.o obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN) += mach-arduino-yun.o obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_ATH79_MACH_BHR_4GRV2) += mach-bhr-4grv2.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c new file mode 100644 index 0000000..64955c7 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c @@ -0,0 +1,260 @@ + +/* + * Atheros ARCHER_C7 reference board support + * + * Copyright (c) 2017 Felix Fietkau <nbd@nbd.name> + * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include <linux/platform_device.h> +#include <linux/ath9k_platform.h> +#include <linux/ar8216_platform.h> +#include <linux/proc_fs.h> +#include <linux/gpio.h> +#include <linux/spi/spi_gpio.h> +#include <linux/spi/74x164.h> + +#include <asm/mach-ath79/ar71xx_regs.h> + +#include "common.h" +#include "dev-m25p80.h" +#include "machtypes.h" +#include "pci.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-spi.h" +#include "dev-usb.h" +#include "dev-wmac.h" + + +#define ARCHER_C7_GPIO_SHIFT_OE 1 +#define ARCHER_C7_GPIO_SHIFT_SER 14 +#define ARCHER_C7_GPIO_SHIFT_SRCLK 15 +#define ARCHER_C7_GPIO_SHIFT_RCLK 16 +#define ARCHER_C7_GPIO_SHIFT_SRCLR 21 + +#define ARCHER_C7_GPIO_BTN_RESET 5 +#define ARCHER_C7_GPIO_BTN_WPS_WIFI 2 + +#define ARCHER_C7_GPIO_LED_WLAN5 9 +#define ARCHER_C7_GPIO_LED_POWER 6 +#define ARCHER_C7_GPIO_LED_USB1 7 +#define ARCHER_C7_GPIO_LED_USB2 8 + +#define ARCHER_C7_74HC_GPIO_BASE QCA956X_GPIO_COUNT +#define ARCHER_C7_GPIO_LED_WPS (ARCHER_C7_74HC_GPIO_BASE + 0) +#define ARCHER_C7_GPIO_LED_LAN1 (ARCHER_C7_74HC_GPIO_BASE + 1) +#define ARCHER_C7_GPIO_LED_LAN2 (ARCHER_C7_74HC_GPIO_BASE + 2) +#define ARCHER_C7_GPIO_LED_LAN3 (ARCHER_C7_74HC_GPIO_BASE + 3) +#define ARCHER_C7_GPIO_LED_LAN4 (ARCHER_C7_74HC_GPIO_BASE + 4) +#define ARCHER_C7_GPIO_LED_WAN_GREEN (ARCHER_C7_74HC_GPIO_BASE + 5) +#define ARCHER_C7_GPIO_LED_WAN_AMBER (ARCHER_C7_74HC_GPIO_BASE + 6) +#define ARCHER_C7_GPIO_LED_WLAN2 (ARCHER_C7_74HC_GPIO_BASE + 7) + +#define ARCHER_C7_KEYS_POLL_INTERVAL 20 /* msecs */ +#define ARCHER_C7_KEYS_DEBOUNCE_INTERVAL (3 * ARCHER_C7_KEYS_POLL_INTERVAL) + +#define ARCHER_C7_MAC0_OFFSET 0 +#define ARCHER_C7_MAC1_OFFSET 6 +#define ARCHER_C7_WMAC_CALDATA_OFFSET 0x1000 + +#define ARCHER_C7_GPIO_MDC 3 +#define ARCHER_C7_GPIO_MDIO 4 + +static struct spi_gpio_platform_data archer_c7_v4_spi_data = { + .sck = ARCHER_C7_GPIO_SHIFT_SRCLK, + .miso = SPI_GPIO_NO_MISO, + .mosi = ARCHER_C7_GPIO_SHIFT_SER, + .num_chipselect = 1, +}; + +static u8 archer_c7_v4_ssr_initdata __initdata = 0xff; + +static struct gen_74x164_chip_platform_data archer_c7_v4_ssr_data = { + .base = ARCHER_C7_74HC_GPIO_BASE, + .num_registers = 1, + .init_data = &archer_c7_v4_ssr_initdata, +}; + +static struct platform_device archer_c7_v4_spi_device = { + .name = "spi_gpio", + .id = 1, + .dev = { + .platform_data = &archer_c7_v4_spi_data, + }, +}; + +static struct spi_board_info archer_c7_v4_spi_info[] = { + { + .bus_num = 1, + .chip_select = 0, + .max_speed_hz = 10000000, + .modalias = "74x164", + .platform_data = &archer_c7_v4_ssr_data, + .controller_data = (void *) ARCHER_C7_GPIO_SHIFT_RCLK, + }, +}; + +static struct gpio_led archer_c7_v4_leds_gpio[] __initdata = { + { + .name = "archer-c7-v4:green:power", + .gpio = ARCHER_C7_GPIO_LED_POWER, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wps", + .gpio = ARCHER_C7_GPIO_LED_WPS, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wlan2g", + .gpio = ARCHER_C7_GPIO_LED_WLAN2, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wlan5g", + .gpio = ARCHER_C7_GPIO_LED_WLAN5, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan1", + .gpio = ARCHER_C7_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan2", + .gpio = ARCHER_C7_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan3", + .gpio = ARCHER_C7_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan4", + .gpio = ARCHER_C7_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wan", + .gpio = ARCHER_C7_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "archer-c7-v4:amber:wan", + .gpio = ARCHER_C7_GPIO_LED_WAN_AMBER, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:usb1", + .gpio = ARCHER_C7_GPIO_LED_USB1, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:usb2", + .gpio = ARCHER_C7_GPIO_LED_USB2, + .active_low = 1, + }, +}; + +static struct gpio_keys_button archer_c7_v4_gpio_keys[] __initdata = { + { + .desc = "WPS and WIFI button", + .type = EV_KEY, + .code = KEY_WPS_BUTTON, + .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL, + .gpio = ARCHER_C7_GPIO_BTN_WPS_WIFI, + .active_low = 1, + }, + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL, + .gpio = ARCHER_C7_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static struct ar8327_pad_cfg archer_c7_v4_ar8337_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data archer_c7_v4_ar8337_data = { + .pad0_cfg = &archer_c7_v4_ar8337_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + +static struct mdio_board_info archer_c7_v4_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &archer_c7_v4_ar8337_data, + }, +}; + + +static void __init archer_c7_v4_setup(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 *mac = (u8 *) KSEG1ADDR(0x1ff00008); + + ath79_register_m25p80(NULL); + + spi_register_board_info(archer_c7_v4_spi_info, + ARRAY_SIZE(archer_c7_v4_spi_info)); + + platform_device_register(&archer_c7_v4_spi_device); + + gpio_request_one(ARCHER_C7_GPIO_SHIFT_OE, + GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED, + "LED control"); + + gpio_request_one(ARCHER_C7_GPIO_SHIFT_SRCLR, + GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, + "LED reset"); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c7_v4_leds_gpio), + archer_c7_v4_leds_gpio); + + ath79_register_gpio_keys_polled(-1, ARCHER_C7_KEYS_POLL_INTERVAL, + ARRAY_SIZE(archer_c7_v4_gpio_keys), + archer_c7_v4_gpio_keys); + + ath79_register_usb(); + + ath79_gpio_output_select(ARCHER_C7_GPIO_MDC, QCA956X_GPIO_OUT_MUX_GE0_MDC); + ath79_gpio_output_select(ARCHER_C7_GPIO_MDIO, QCA956X_GPIO_OUT_MUX_GE0_MDO); + + ath79_register_mdio(0, 0x0); + + mdiobus_register_board_info(archer_c7_v4_mdio0_info, + ARRAY_SIZE(archer_c7_v4_mdio0_info)); + + ath79_register_wmac(art + ARCHER_C7_WMAC_CALDATA_OFFSET, mac); + ath79_register_pci(); + + /* GMAC0 is connected to an AR8337 switch */ + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.speed = SPEED_1000; + ath79_eth0_data.duplex = DUPLEX_FULL; + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_register_eth(0); +} + +MIPS_MACHINE(ATH79_MACH_ARCHER_C7_V4, "ARCHER-C7-V4", "TP-LINK Archer C7 v4", + archer_c7_v4_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index c75ff4f..01472b6 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -49,6 +49,7 @@ enum ath79_mach_type { ATH79_MACH_ARCHER_C60_V1, /* TP-LINK Archer C60 V1 board */ ATH79_MACH_ARCHER_C7, /* TP-LINK Archer C7 board */ ATH79_MACH_ARCHER_C7_V2, /* TP-LINK Archer C7 V2 board */ + ATH79_MACH_ARCHER_C7_V4, /* TP-LINK Archer C7 V4 board */ ATH79_MACH_ARDUINO_YUN, /* Yun */ ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ ATH79_MACH_BHR_4GRV2, /* Buffalo BHR-4GRV2 */ diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 5d2518b..ae711e7 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -200,7 +200,20 @@ define Device/tl-wdr7500-v3 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000003 endef -TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il tl-wdr7500-v3 + +define Device/archer-c7-v4 + $(Device/archer-cxx) + DEVICE_TITLE := TP-LINK Archer C7 v4 + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + BOARDNAME := ARCHER-C7-V4 + TPLINK_BOARD_ID := ARCHER-C7-V4 + IMAGE_SIZE := 15104k + LOADER_TYPE := elf + MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,1536k(kernel),13568k(rootfs),960k(config)ro,64k(art)ro,15104k@0x40000(firmware) + SUPPORTED_DEVICES := archer-c7-v4 +endef + +TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il tl-wdr7500-v3 archer-c7-v4 define Device/cpe510-520-v1 DEVICE_TITLE := TP-LINK CPE510/520 v1 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index dceba75..219d198 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -485,6 +485,49 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system" }, + /** Firmware layout for the C7 */ + { + .id = "ARCHER-C7-V4", + .support_list = + "SupportList:\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:45550000}\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n", + .support_trail = '\x00', + .soft_ver = "soft_ver:1.0.0\n", + + /** + We use a bigger os-image partition than the stock images (and thus + smaller file-system), as our kernel doesn't fit in the stock firmware's + 1MB os-image. + */ + .partitions = { + {"factory-boot", 0x00000, 0x20000}, + {"fs-uboot", 0x20000, 0x20000}, + {"os-image", 0x40000, 0x180000}, /* Stock: base 0x40000 size 0x120000 */ + {"file-system", 0x1c0000, 0xd40000}, /* Stock: base 0x160000 size 0xda0000 */ + {"default-mac", 0xf00000, 0x00200}, + {"pin", 0xf00200, 0x00200}, + {"device-id", 0xf00400, 0x00100}, + {"product-info", 0xf00500, 0x0fb00}, + {"soft-version", 0xf10000, 0x00100}, + {"extra-para", 0xf11000, 0x01000}, + {"support-list", 0xf12000, 0x0a000}, + {"profile", 0xf1c000, 0x04000}, + {"default-config", 0xf20000, 0x10000}, + {"user-config", 0xf30000, 0x40000}, + {"qos-db", 0xf70000, 0x40000}, + {"certificate", 0xfb0000, 0x10000}, + {"partition-table", 0xfc0000, 0x10000}, + {"log", 0xfd0000, 0x20000}, + {"radio", 0xff0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system", + }, + /** Firmware layout for the C9 */ { .id = "ARCHERC9", @@ -1214,6 +1257,9 @@ static void build_image(const char *output, if (strcasecmp(info->id, "ARCHER-C25-V1") == 0) { const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}; parts[5] = put_data("extra-para", mdat, 11); + } else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0) { + const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00}; + parts[5] = put_data("extra-para", mdat, 11); } size_t len; |