From: Christian Mehlis Date: Sun, 26 Feb 2017 11:25:57 +0000 (+0100) Subject: ar71xx: Compex WPJ563 support X-Git-Tag: v18.06.0-rc1~3192 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=dc4eae7a8cf676911b0048b1e73c6f9adeea2f06 ar71xx: Compex WPJ563 support Specification: - SoC: Qualcomm Atheros QCA9563 (775 MHz, MIPS 74Kc) - RAM: 128 MiB - Storage: 16MB NOR flash - Wireless: Built into QCA9563 (Dragonfly), PHY modes b/g/n, 3x3 MIMO - Ethernet: 2x1G Tested and working: - ethernet / switch / lan / wan - 2.4GHz SoC wifi - PCIe - leds - buzzer Ramload: - tftpboot 0x84000000 lede-ar71xx-generic-wpj563-16M-initramfs-uImage.bin - bootm 0x84000000 Install: - tftpboot 0x80500000 lede-ar71xx-generic-wpj563-16M-squashfs-sysupgrade.bin - erase 0x9f030000 +$filesize - erase 0x9f680000 +1 - cp.b $fileaddr 0x9f030000 $filesize Erasing 0x9f680000 is required because uboot defines "bootcmd=bootm 0x9f680000 || bootm 0x9f030000", so it first tries to boot the higher address. I think the 16 mb flash are intended to be used as 8+8mb for a fallback image. In my hardware only the lower address has a bootable image. But to make sure future hardware will boot lede too, I erase one block, so uboot will skip this address. Signed-off-by: Christian Mehlis --- 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 e5892ac485..bf7c4dcd3c 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -466,6 +466,10 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "5:lan" "1:wan" "6@eth0" ;; + wpj563) + ucidef_add_switch "switch0" \ + "0@eth0" "2:lan" "3:wan" + ;; wrt160nl) ucidef_set_interfaces_lan_wan "eth0.1" "eth1" 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 fed51a17d7..3cde175664 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -469,6 +469,9 @@ get_status_led() { wpj558) status_led="$board:green:sig3" ;; + wpj563) + status_led="$board:green:sig1" + ;; wrt400n|\ wrt160nl) status_led="$board:blue:wps" diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index eedcb7829c..25f6b01c18 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -1240,6 +1240,9 @@ ar71xx_board_detect() { *"WPJ558") name="wpj558" ;; + *"WPJ563") + name="wpj563" + ;; *"WPN824N") name="wpn824n" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 2f0228b823..fb582091ce 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -283,6 +283,7 @@ platform_check_image() { wpj342|\ wpj344|\ wpj531|\ + wpj563|\ wrt400n|\ wrtnode2q|\ wzr-450hp2|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 386ce6824e..6d0941be55 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -226,6 +226,7 @@ CONFIG_ATH79_MACH_WPJ342=y CONFIG_ATH79_MACH_WPJ344=y CONFIG_ATH79_MACH_WPJ531=y CONFIG_ATH79_MACH_WPJ558=y +CONFIG_ATH79_MACH_WPJ563=y CONFIG_ATH79_MACH_WRT160NL=y CONFIG_ATH79_MACH_WRT400N=y CONFIG_ATH79_MACH_WRTNODE2Q=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 669e02684f..183e91a41d 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -459,6 +459,17 @@ config ATH79_MACH_WPJ558 select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_WPJ563 + bool "Compex WPJ563 board 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_XD3200 bool "YunCore XD3200 support" select SOC_QCA956X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 1180d4d73b..01ec1332b0 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -231,6 +231,7 @@ obj-$(CONFIG_ATH79_MACH_WPJ342) += mach-wpj342.o obj-$(CONFIG_ATH79_MACH_WPJ344) += mach-wpj344.o obj-$(CONFIG_ATH79_MACH_WPJ531) += mach-wpj531.o obj-$(CONFIG_ATH79_MACH_WPJ558) += mach-wpj558.o +obj-$(CONFIG_ATH79_MACH_WPJ563) += mach-wpj563.o obj-$(CONFIG_ATH79_MACH_WRT160NL) += mach-wrt160nl.o obj-$(CONFIG_ATH79_MACH_WRT400N) += mach-wrt400n.o obj-$(CONFIG_ATH79_MACH_WRTNODE2Q) += mach-wrtnode2q.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c new file mode 100644 index 0000000000..70593d8168 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c @@ -0,0 +1,150 @@ +/* + * Compex WPJ563 board support + * + * Copyright (c) 2015 Qualcomm Atheros + * Copyright (c) 2012 Gabor Juhos + * + * 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 +#include +#include +#include + +#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 WPJ563_GPIO_LED_SIG1 1 +#define WPJ563_GPIO_LED_SIG2 5 +#define WPJ563_GPIO_LED_SIG3 6 +#define WPJ563_GPIO_LED_SIG4 7 +#define WPJ563_GPIO_BUZZER 19 + +#define WPJ563_GPIO_BTN_RESET 2 +#define WPJ563_KEYS_POLL_INTERVAL 20 /* msecs */ +#define WPJ563_KEYS_DEBOUNCE_INTERVAL (3 * WPJ563_KEYS_POLL_INTERVAL) + +#define WPJ563_MAC0_OFFSET 0x10 +#define WPJ563_MAC1_OFFSET 0x18 +#define WPJ563_WMAC_CALDATA_OFFSET 0x1000 + +static struct gpio_led WPJ563_leds_gpio[] __initdata = { + { + .name = "wpj563:green:sig1", + .gpio = WPJ563_GPIO_LED_SIG1, + .active_low = 1, + }, + { + .name = "wpj563:green:sig2", + .gpio = WPJ563_GPIO_LED_SIG2, + .active_low = 1, + }, + { + .name = "wpj563:green:sig3", + .gpio = WPJ563_GPIO_LED_SIG3, + .active_low = 1, + }, + { + .name = "wpj563:green:sig4", + .gpio = WPJ563_GPIO_LED_SIG4, + .active_low = 1, + }, + { + .name = "wpj563:buzzer", + .gpio = WPJ563_GPIO_BUZZER, + .active_low = 0, + } +}; + +static struct gpio_keys_button WPJ563_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = WPJ563_KEYS_DEBOUNCE_INTERVAL, + .gpio = WPJ563_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static struct ar8327_pad_cfg WPJ563_ar8337_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data WPJ563_ar8337_data = { + .pad0_cfg = &WPJ563_ar8337_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + +static struct mdio_board_info WPJ563_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &WPJ563_ar8337_data, + }, +}; + +static void __init WPJ563_setup(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 *mac = (u8 *) KSEG1ADDR(0x1f02e000); + + ath79_register_m25p80(NULL); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(WPJ563_leds_gpio), + WPJ563_leds_gpio); + ath79_register_gpio_keys_polled(-1, WPJ563_KEYS_POLL_INTERVAL, + ARRAY_SIZE(WPJ563_gpio_keys), + WPJ563_gpio_keys); + + ath79_register_usb(); + + ath79_register_wmac(art + WPJ563_WMAC_CALDATA_OFFSET, NULL); + + ath79_register_pci(); + + mdiobus_register_board_info(WPJ563_mdio0_info, + ARRAY_SIZE(WPJ563_mdio0_info)); + ath79_register_mdio(0, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, mac + WPJ563_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, mac + WPJ563_MAC1_OFFSET, 0); + + /* GMAC0 is connected to an QCA8334 switch */ + 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_WPJ563, "WPJ563", "Compex WPJ563", WPJ563_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index b9cc243f39..4278f5ed77 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -303,6 +303,7 @@ enum ath79_mach_type { ATH79_MACH_WPJ344, /* Compex WPJ344 */ ATH79_MACH_WPJ531, /* Compex WPJ531 */ ATH79_MACH_WPJ558, /* Compex WPJ558 */ + ATH79_MACH_WPJ563, /* Compex WPJ563 */ ATH79_MACH_WPN824N, /* NETGEAR WPN824N */ ATH79_MACH_WRT160NL, /* Linksys WRT160NL */ ATH79_MACH_WRT400N, /* Linksys WRT400N */ diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 2ad058e845..ebcb183b03 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -825,3 +825,12 @@ define Device/wpj558 IMAGE_SIZE := 16128k endef TARGET_DEVICES += wpj558 + +define Device/wpj563 + DEVICE_TITLE := Compex WPJ563 (16MB flash) + DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport + BOARDNAME := WPJ563 + MTDPARTS := spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro + IMAGE_SIZE := 16128k +endef +TARGET_DEVICES += wpj563 diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index 1cc485a7d1..ecaa6e53d0 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -191,6 +191,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y # CONFIG_ATH79_MACH_WPJ344 is not set # CONFIG_ATH79_MACH_WPJ531 is not set # CONFIG_ATH79_MACH_WPJ558 is not set +# CONFIG_ATH79_MACH_WPJ563 is not set # CONFIG_ATH79_MACH_WRT160NL is not set # CONFIG_ATH79_MACH_WRT400N is not set # CONFIG_ATH79_MACH_WRTNODE2Q is not set diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default index 16e652ed4e..1c5d0baa98 100644 --- a/target/linux/ar71xx/nand/config-default +++ b/target/linux/ar71xx/nand/config-default @@ -176,6 +176,7 @@ # CONFIG_ATH79_MACH_WPJ344 is not set # CONFIG_ATH79_MACH_WPJ531 is not set # CONFIG_ATH79_MACH_WPJ558 is not set +# CONFIG_ATH79_MACH_WPJ563 is not set # CONFIG_ATH79_MACH_WRT160NL is not set # CONFIG_ATH79_MACH_WRT400N is not set # CONFIG_ATH79_MACH_WRTNODE2Q is not set