From: Piotr Dymacz Date: Fri, 2 Dec 2016 21:42:41 +0000 (+0100) Subject: ar71xx: add support for YunCore SR3200 and XD3200 X-Git-Tag: v17.01.0-rc1~588 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c198ca682c187e61730119134e1dde75da2e7a16;p=openwrt%2Fstaging%2Fxback.git ar71xx: add support for YunCore SR3200 and XD3200 YunCore SR3200 is a dual-band AC1200 router, based on Qualcomm/Atheros QCA9563+QCA9882+QCA8337N. YunCore XD3200 (FCC ID: 2ADUG-XD3200) is a dual-band AC1200 ceiling mount AP with PoE support, based on Qualcomm/Atheros QCA9563+QCA9882+QCA8334. Common specification: - 775/650/258 MHz (CPU/DDR/AHB) - 128 MB or RAM (DDR2) - 16 MB of FLASH (SPI NOR) - 2T2R 2.4 GHz, with ext. PA (SKY65174-21), up to 30 dBm - 2T2R 5 GHz, with ext. PA (SKY85405-11) and LNA (SKY85601-11), up to 30 dBm SR3200 specification: - 5x 10/100/1000 Mbps Ethernet - 6x ext. RP-SMA antennas (actually, only 4 are connected with radio chips) - 3x LED (+ 5x LED in RJ45 sockets), 1x button - UART header on PCB XD3200 specification: - 2x 10/100/1000 Mbps Ethernet, with 802.3at PoE support (WAN port) - 4x internal antennas - 3 sets of LEDs on external PCB (+ 2x LED near RJ45 sockets), 1x button - UART and JTAG (custom 6-pin, 2 mm pitch) headers on PCB LED for 5 GHz WLAN is currently not supported on both devices as it is connected directly to the QCA9882 radio chip. Flash instruction under vendor firmware, using telnet/SSH: 1. If your firmware does not have root password, go to point 5 2. Connect PC with 192.168.1.x address to LAN or WAN port 3. Power up device, enter failsafe mode with button (no LED indicator!) 4. Change root password and reboot (mount_root, passwd ..., reboot -f) 5. Upload lede-ar71xx-...-sysupgrade.bin to /tmp using SCP 6. Connect PC with 192.168.188.x address to LAN port, SSH to 192.168.188.253 7. Invoke: - cd /tmp - fw_setenv bootcmd "bootm 0x9fe80000 || bootm 0x9f050000" - mtd -e firmware -r write lede-ar71xx-...-sysupgrade.bin firmware Flash instruction under U-Boot, using UART: 1. tftp 0x80060000 lede-ar71xx-...-sysupgrade.bin 2. erase 0x9f050000 +$filesize 3. cp.b $fileaddr 0x9f050000 $filesize 4. setenv bootcmd "bootm 0x9fe80000 || bootm 0x9f050000" 5. saveenv && reset Signed-off-by: Piotr Dymacz --- 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 a93ea1d578..38e665fb64 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -444,6 +444,9 @@ som9331) ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt" ucidef_set_led_usbdev "usb" "USB" "$board:green:system" "1-1" ;; +sr3200) + ucidef_set_led_wlan "wlan2g" "WLAN2G" "$board:green:wlan2g" "phy1tpt" + ;; tellstick-znet-lite) ucidef_set_led_netdev "lan_act" "LANACT" "tellstick:green:lan" "eth0" "tx rx" ucidef_set_led_netdev "lan_link" "LANLINK" "tellstick:orange:lan" "eth0" "link" @@ -738,6 +741,9 @@ wzr-hp-g300nh) ucidef_set_led_netdev "router" "Router" "buffalo:green:router" "eth1" ucidef_set_led_usbdev "usb" "USB" "buffalo:blue:usb" "1-1" ;; +xd3200) + ucidef_set_led_wlan "wlan2g" "WLAN2G" "$board:blue:wlan2g" "phy1tpt" + ;; z1) ucidef_set_led_netdev "wlan1" "WLAN1" "$board:blue:tricolor0" "wlan1" ;; 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 949f161c9c..57d690d60c 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -230,6 +230,7 @@ ar71xx_setup_interfaces() dir-835-a1|\ esr900|\ mynet-n750|\ + sr3200|\ wndr3700v4|\ wndr4300) ucidef_add_switch "switch0" \ @@ -395,7 +396,8 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan" "2:wan" ;; - unifiac-pro) + unifiac-pro|\ + xd3200) ucidef_add_switch "switch0" \ "0@eth0" "2:lan" "3:wan" ;; diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 9b9aea8a77..43ea2b683e 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -18,7 +18,9 @@ get_status_led() { antminer-s3|\ antminer-r1|\ minibox-v1|\ - som9331) + som9331|\ + sr3200|\ + xd3200) status_led="$board:green:system" ;; ap132|\ 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 7983dad80c..97875bd79a 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 @@ -49,7 +49,9 @@ case "$FIRMWARE" in case $board in cf-e380ac-v1|\ cf-e380ac-v2|\ - dlan-pro-1200-ac) + dlan-pro-1200-ac|\ + sr3200|\ + xd3200) ath10kcal_extract "art" 20480 2116 ;; dap-2695-a1) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 526d03344b..c27cd136b0 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -905,6 +905,9 @@ ar71xx_board_detect() { *SOM9331) name="som9331" ;; + *SR3200) + name="sr3200" + ;; *TEW-632BRP) name="tew-632brp" ;; @@ -1190,6 +1193,9 @@ ar71xx_board_detect() { *WHR-HP-G300N) name="whr-hp-g300n" ;; + *XD3200) + name="xd3200" + ;; *Z1) name="z1" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 5f4375da6a..7b59bf3a55 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -228,6 +228,7 @@ platform_check_image() { rocket-m-xw|\ rocket-m|\ rw2458n|\ + sr3200|\ tew-632brp|\ tew-712br|\ tew-732br|\ @@ -251,7 +252,8 @@ platform_check_image() { wzr-hp-ag300h|\ wzr-hp-g300nh2|\ wzr-hp-g300nh|\ - wzr-hp-g450h) + wzr-hp-g450h|\ + xd3200) [ "$magic" != "2705" ] && { echo "Invalid image type." return 1 diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index c6a757a7eb..3181797352 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -150,6 +150,7 @@ CONFIG_ATH79_MACH_R6100=y CONFIG_ATH79_MACH_RW2458N=y CONFIG_ATH79_MACH_SMART_300=y CONFIG_ATH79_MACH_SOM9331=y +CONFIG_ATH79_MACH_SR3200=y CONFIG_ATH79_MACH_TELLSTICK_ZNET_LITE=y CONFIG_ATH79_MACH_TEW_632BRP=y CONFIG_ATH79_MACH_TEW_673GRU=y @@ -217,6 +218,7 @@ CONFIG_ATH79_MACH_WZR_HP_AG300H=y CONFIG_ATH79_MACH_WZR_HP_G300NH=y CONFIG_ATH79_MACH_WZR_HP_G300NH2=y CONFIG_ATH79_MACH_WZR_HP_G450H=y +CONFIG_ATH79_MACH_XD3200=y CONFIG_ATH79_MACH_Z1=y CONFIG_ATH79_MACH_ZBT_WE1526=y CONFIG_ATH79_MACH_ZCN_1523H=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index f1bfcb80a4..9e1b50e262 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -280,6 +280,17 @@ config ATH79_MACH_SOM9331 select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_SR3200 + bool "YunCore SR3200 support" + select SOC_QCA956X + 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_BHR_4GRV2 bool "Buffalo BHR-4GRV2 board support" select SOC_QCA955X @@ -425,6 +436,16 @@ config ATH79_MACH_WPJ558 select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_XD3200 + bool "YunCore XD3200 support" + select SOC_QCA956X + 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_WMAC + config ATH79_MACH_DGL_5500_A1 bool "D-Link DGL-5500 A1 support" select SOC_QCA955X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index ac2dbbb23f..e573b4b5fe 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -156,6 +156,7 @@ obj-$(CONFIG_ATH79_MACH_RBSXTLITE) += mach-rbsxtlite.o obj-$(CONFIG_ATH79_MACH_RW2458N) += mach-rw2458n.o obj-$(CONFIG_ATH79_MACH_SMART_300) += mach-smart-300.o obj-$(CONFIG_ATH79_MACH_SOM9331) += mach-som9331.o +obj-$(CONFIG_ATH79_MACH_SR3200) += mach-sr3200.o obj-$(CONFIG_ATH79_MACH_TELLSTICK_ZNET_LITE) += mach-tellstick-znet-lite.o obj-$(CONFIG_ATH79_MACH_TEW_632BRP) += mach-tew-632brp.o obj-$(CONFIG_ATH79_MACH_TEW_673GRU) += mach-tew-673gru.o @@ -223,6 +224,7 @@ obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H) += mach-wzr-hp-ag300h.o obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH) += mach-wzr-hp-g300nh.o obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2) += mach-wzr-hp-g300nh2.o obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H) += mach-wzr-hp-g450h.o +obj-$(CONFIG_ATH79_MACH_XD3200) += mach-sr3200.o obj-$(CONFIG_ATH79_MACH_Z1) += mach-z1.o obj-$(CONFIG_ATH79_MACH_ZBT_WE1526) += mach-zbt-we1526.o obj-$(CONFIG_ATH79_MACH_ZCN_1523H) += mach-zcn-1523h.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c new file mode 100644 index 0000000000..51fcccfaca --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c @@ -0,0 +1,187 @@ +/* + * Support for YunCore SR3200 and XD3200 boards + * + * Copyright (C) 2016 Piotr Dymacz + * + * 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 +#include +#include +#include + +#include +#include + +#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-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define SR3200_XD3200_GPIO_LED_SYSTEM 1 +#define SR3200_XD3200_GPIO_LED_WLAN2G 19 + +#define SR3200_XD3200_GPIO_BTN_RESET 2 + +#define SR3200_XD3200_KEYS_POLL_INTERVAL 20 +#define SR3200_XD3200_KEYS_DEBOUNCE_INTERVAL \ + (3 * SR3200_XD3200_KEYS_POLL_INTERVAL) + +static struct gpio_led xd3200_leds_gpio[] __initdata = { + { + .name = "xd3200:green:system", + .gpio = SR3200_XD3200_GPIO_LED_SYSTEM, + .active_low = 1, + }, + { + .name = "xd3200:blue:wlan2g", + .gpio = SR3200_XD3200_GPIO_LED_WLAN2G, + .active_low = 1, + }, +}; + +static struct gpio_led sr3200_leds_gpio[] __initdata = { + { + .name = "sr3200:green:system", + .gpio = SR3200_XD3200_GPIO_LED_SYSTEM, + .active_low = 1, + }, + { + .name = "sr3200:green:wlan2g", + .gpio = SR3200_XD3200_GPIO_LED_WLAN2G, + .active_low = 1, + }, +}; + +static struct gpio_keys_button sr3200_xd3200_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = SR3200_XD3200_KEYS_DEBOUNCE_INTERVAL, + .gpio = SR3200_XD3200_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static const struct ar8327_led_info sr3200_leds_qca833x[] = { + AR8327_LED_INFO(PHY0_0, HW, "sr3200:green:lan1"), + AR8327_LED_INFO(PHY1_0, HW, "sr3200:green:lan2"), + AR8327_LED_INFO(PHY2_0, HW, "sr3200:green:lan3"), + AR8327_LED_INFO(PHY3_0, HW, "sr3200:green:lan4"), + AR8327_LED_INFO(PHY4_0, HW, "sr3200:green:wan"), +}; + +static const struct ar8327_led_info xd3200_leds_qca833x[] = { + AR8327_LED_INFO(PHY1_0, HW, "xd3200:green:lan"), + AR8327_LED_INFO(PHY2_0, HW, "xd3200:green:wan"), +}; + +/* Blink rate: 1 Gbps -> 8 hz, 100 Mbs -> 4 Hz, 10 Mbps -> 2 Hz */ +static struct ar8327_led_cfg sr3200_xd3200_qca833x_led_cfg = { + .led_ctrl0 = 0xcf37cf37, + .led_ctrl1 = 0xcf37cf37, + .led_ctrl2 = 0xcf37cf37, + .led_ctrl3 = 0x0, + .open_drain = true, +}; + +static struct ar8327_pad_cfg sr3200_xd3200_qca833x_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data sr3200_xd3200_qca833x_data = { + .pad0_cfg = &sr3200_xd3200_qca833x_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, + .led_cfg = &sr3200_xd3200_qca833x_led_cfg, +}; + +static struct mdio_board_info sr3200_xd3200_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &sr3200_xd3200_qca833x_data, + }, +}; + +static void __init sr3200_xd3200_common_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000); + + ath79_register_m25p80(NULL); + + ath79_register_mdio(0, 0x0); + mdiobus_register_board_info(sr3200_xd3200_mdio0_info, + ARRAY_SIZE(sr3200_xd3200_mdio0_info)); + + /* GMAC0 is connected to QCA8334/QCA8337N switch */ + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.speed = SPEED_1000; + ath79_eth0_data.duplex = DUPLEX_FULL; + + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); + ath79_register_eth(0); + + ath79_register_wmac(mac + 0x1000, NULL); + + ap91_pci_init(mac + 0x5000, NULL); + + ath79_gpio_direction_select(SR3200_XD3200_GPIO_LED_SYSTEM, true); + ath79_gpio_direction_select(SR3200_XD3200_GPIO_LED_WLAN2G, true); + + /* Mute LEDs on boot */ + gpio_set_value(SR3200_XD3200_GPIO_LED_SYSTEM, 1); + gpio_set_value(SR3200_XD3200_GPIO_LED_WLAN2G, 1); + + ath79_gpio_output_select(SR3200_XD3200_GPIO_LED_SYSTEM, 0); + ath79_gpio_output_select(SR3200_XD3200_GPIO_LED_WLAN2G, 0); + + ath79_register_gpio_keys_polled(-1, SR3200_XD3200_KEYS_POLL_INTERVAL, + ARRAY_SIZE(sr3200_xd3200_gpio_keys), + sr3200_xd3200_gpio_keys); +} + +static void __init sr3200_setup(void) +{ + sr3200_xd3200_qca833x_data.leds = sr3200_leds_qca833x; + sr3200_xd3200_qca833x_data.num_leds = ARRAY_SIZE(sr3200_leds_qca833x); + + sr3200_xd3200_common_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(sr3200_leds_gpio), + sr3200_leds_gpio); + + ath79_register_usb(); +} + +MIPS_MACHINE(ATH79_MACH_SR3200, "SR3200", "YunCore SR3200", sr3200_setup); + +static void __init xd3200_setup(void) +{ + sr3200_xd3200_qca833x_data.leds = xd3200_leds_qca833x; + sr3200_xd3200_qca833x_data.num_leds = ARRAY_SIZE(xd3200_leds_qca833x); + + sr3200_xd3200_common_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(xd3200_leds_gpio), + xd3200_leds_gpio); +} + +MIPS_MACHINE(ATH79_MACH_XD3200, "XD3200", "YunCore XD3200", xd3200_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 9a8da22f65..0054067406 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -173,6 +173,7 @@ enum ath79_mach_type { ATH79_MACH_RW2458N, /* Redwave RW2458N */ ATH79_MACH_SMART_300, /* NC-LINK SMART-300 */ ATH79_MACH_SOM9331, /* OpenEmbed SOM9331 */ + ATH79_MACH_SR3200, /* YunCore SR3200 */ ATH79_MACH_TELLSTICK_ZNET_LITE, /* TellStick ZNet Lite */ ATH79_MACH_TEW_632BRP, /* TRENDnet TEW-632BRP */ ATH79_MACH_TEW_673GRU, /* TRENDnet TEW-673GRU */ @@ -282,6 +283,7 @@ enum ath79_mach_type { ATH79_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */ ATH79_MACH_WZR_HP_G300NH2, /* Buffalo WZR-HP-G300NH2 */ ATH79_MACH_WZR_HP_G450H, /* Buffalo WZR-HP-G450H */ + ATH79_MACH_XD3200, /* YunCore XD3200 */ ATH79_MACH_Z1, /* Cisco Meraki Z1 */ ATH79_MACH_ZBT_WE1526, /* Zbtlink ZBT-WE1526 */ ATH79_MACH_ZCN_1523H_2, /* Zcomax ZCN-1523H-2-xx */ diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 6ceabeb288..e2867e6c40 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -484,6 +484,24 @@ define Device/som9331 endef TARGET_DEVICES += som9331 +define Device/sr3200 + DEVICE_TITLE := YunCore SR3200 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k ath10k-firmware-qca988x + BOARDNAME = SR3200 + IMAGE_SIZE = 16000k + CONSOLE = ttyS0,115200 + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),16000k(firmware),64k(art)ro +endef +TARGET_DEVICES += sr3200 + +define Device/xd3200 + $(Device/sr3200) + DEVICE_TITLE := YunCore XD3200 + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + BOARDNAME = XD3200 +endef +TARGET_DEVICES += xd3200 + define Device/tellstick-znet-lite $(Device/tplink-16mlzma) DEVICE_TITLE := TellStick ZNet Lite