ar71xx: Compex WPJ563 support
authorChristian Mehlis <christian@m3hlis.de>
Sun, 26 Feb 2017 11:25:57 +0000 (12:25 +0100)
committerJohn Crispin <john@phrozen.org>
Thu, 30 Mar 2017 07:57:22 +0000 (09:57 +0200)
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 <christian@m3hlis.de>
12 files changed:
target/linux/ar71xx/base-files/etc/board.d/02_network
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/config-4.4
target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
target/linux/ar71xx/files/arch/mips/ath79/Makefile
target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c [new file with mode: 0644]
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
target/linux/ar71xx/image/generic.mk
target/linux/ar71xx/mikrotik/config-default
target/linux/ar71xx/nand/config-default

index e5892ac..bf7c4dc 100755 (executable)
@@ -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" \
index fed51a1..3cde175 100644 (file)
@@ -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"
index eedcb78..25f6b01 100755 (executable)
@@ -1240,6 +1240,9 @@ ar71xx_board_detect() {
        *"WPJ558")
                name="wpj558"
                ;;
+       *"WPJ563")
+               name="wpj563"
+               ;;
        *"WPN824N")
                name="wpn824n"
                ;;
index 2f0228b..fb58209 100755 (executable)
@@ -283,6 +283,7 @@ platform_check_image() {
        wpj342|\
        wpj344|\
        wpj531|\
+       wpj563|\
        wrt400n|\
        wrtnode2q|\
        wzr-450hp2|\
index 386ce68..6d0941b 100644 (file)
@@ -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
index 669e026..183e91a 100644 (file)
@@ -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
index 1180d4d..01ec133 100644 (file)
@@ -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 (file)
index 0000000..70593d8
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+ * Compex WPJ563 board support
+ *
+ * Copyright (c) 2015 Qualcomm Atheros
+ * 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 <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 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);
index b9cc243..4278f5e 100644 (file)
@@ -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 */
index 2ad058e..ebcb183 100644 (file)
@@ -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
index 1cc485a..ecaa6e5 100644 (file)
@@ -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
index 16e652e..1c5d0ba 100644 (file)
 # 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