ar71xx: add support for OCEDO Koala
authorDavid Bauer <mail@david-bauer.net>
Tue, 29 May 2018 15:00:53 +0000 (17:00 +0200)
committerJohn Crispin <john@phrozen.org>
Thu, 7 Jun 2018 07:31:58 +0000 (09:31 +0200)
This commit adds support for the OCEDO Koala

SOC: Qualcomm QCA9558 (Scorpion)
RAM:    128MB
FLASH:  16MiB
WLAN1:  QCA9558 2.4 GHz 802.11bgn 3x3
WLAN2:  QCA9880 5 GHz 802.11nac 3x3
INPUT:  RESET button
LED:    Power, LAN, WiFi 2.4, WiFi 5, SYS
Serial: Header Next to Black metal shield
        Pinout is 3.3V - GND - TX - RX (Arrow Pad is 3.3V)
        The Serial setting is 115200-8-N-1.

Tested and working:
 - Ethernet
 - 2.4 GHz WiFi
 - 5 GHz WiFi
 - TFTP boot from ramdisk image
 - Installation via ramdisk image
 - OpenWRT sysupgrade
 - Buttons
 - LEDs

Installation seems to be possible only through booting an OpenWRT
ramdisk image.

Hold down the reset button while powering on the device. It will load a
ramdisk image named 'koala-uImage-initramfs-lzma.bin' from 192.168.100.8.

Note: depending on the present software, the device might also try to
pull a file called 'koala-uimage-factory'. Only the name differs, it
is still used as a ramdisk image.

Wait for the ramdisk image to boot. OpenWRT can be written to the flash
via sysupgrade or mtd.

Due to the flip-flop bootloader which we not (yet) support, you need to
set the partition the bootloader is selecting. It is possible from the
initramfs image with

 > fw_setenv bootcmd run bootcmd_1

Afterwards you can reboot the device.

Signed-off-by: David Bauer <mail@david-bauer.net>
14 files changed:
package/boot/uboot-envtools/files/ar71xx
target/linux/ar71xx/base-files/etc/board.d/01_leds
target/linux/ar71xx/base-files/etc/board.d/02_network
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/config-4.9
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-koala.c [new file with mode: 0644]
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
target/linux/ar71xx/generic/config-default
target/linux/ar71xx/image/generic-senao.mk

index 516042e91c50fe49a4e652c5abb8c158d8fb25f6..2d9fcea1ac2f0bb11c4f754710f2ba6c409296ef 100644 (file)
@@ -38,6 +38,7 @@ gl-ar750|\
 hornet-ub|\
 hornet-ub-x2|\
 jwap230|\
+koala|\
 mr1750|\
 mr1750v2|\
 mr600|\
index f436854384ed25cfff2f23902042ca77b1cdc7c9..b53aafb0ee446671772fdd21cc6bd03e0ddb9a06 100755 (executable)
@@ -423,6 +423,11 @@ hornet-ub-x2)
        ucidef_set_led_wlan "wlan" "WLAN" "alfa:blue:wlan" "phy0tpt"
        ucidef_set_led_usbdev "usb" "USB" "alfa:blue:usb" "1-1"
        ;;
+koala)
+       ucidef_set_led_default "power" "POWER" "$board:green:power" "1"
+       ucidef_set_led_wlan "wlan2g" "WLAN 2.4GHz" "$board:yellow:wlan2" "phy1tpt"
+       ucidef_set_led_wlan "wlan5g" "WLAN 5GHz" "$board:red:wlan58" "phy0tpt"
+       ;;
 lan-turtle)
        ucidef_set_led_netdev "wan" "WAN" "$board:orange:system" "eth1"
        ;;
index 47153d9481c90db211fece0793dbf0bac671cf08..5044e7f92bd3995b7665f972a8a48a04c3e1c72a 100755 (executable)
@@ -82,6 +82,7 @@ ar71xx_setup_interfaces()
        fritz300e|\
        gl-usb150|\
        hiveap-121|\
+       koala|\
        lbe-m5|\
        loco-m-xw|\
        mr12|\
index 03c639a2b7a7e29f86d5a1891735fc465006b30c..1530dded12c95fc8820df9512a01802960ca417b 100644 (file)
@@ -260,6 +260,9 @@ get_status_led() {
        jwap230)
                status_led="$board:green:led1"
                ;;
+       koala)
+               status_led="$board:blue:sys"
+               ;;
        lan-turtle)
                status_led="$board:orange:system"
                ;;
index f82026c7ad2d619f91d2f740525757f9ed8b511f..c3ae7b64ecaa179f3d31a3dcf46275e71e46d58d 100644 (file)
@@ -105,6 +105,10 @@ case "$FIRMWARE" in
                ath10kcal_extract "art" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
                ;;
+       koala)
+               ath10kcal_extract "art" 20480 2116
+               ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 12) +0)
+               ;;
        mc-mac1200r)
                ath10kcal_extract "art" 20480 2116
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
index c64520d6f2dc3f10bb828075d8fd584661b388c2..ce9225ec941e04a5d4641c1271805d5dc72720b9 100755 (executable)
@@ -768,6 +768,9 @@ ar71xx_board_detect() {
        *"JWAP230")
                name="jwap230"
                ;;
+       *"Koala")
+               name="koala"
+               ;;
        *"LAN Turtle")
                name="lan-turtle"
                ;;
index b3342e3febc44345e2dc031b33c271982dc0f9d5..192c4a7608b02cce5b2afa3e3a5d7b69d1c5771c 100755 (executable)
@@ -689,6 +689,7 @@ platform_check_image() {
        # these boards use metadata images
        fritz300e|\
        fritz4020|\
+       koala|\
        rb-750-r2|\
        rb-750p-pbr2|\
        rb-750up-r2|\
index 9eae158ebeb68b5664d751df445128e8843dc84b..0c0f8f50a14d45628ac90be9266ea65055fa7fcf 100644 (file)
@@ -133,6 +133,7 @@ CONFIG_ATH79=y
 # CONFIG_ATH79_MACH_JA76PF is not set
 # CONFIG_ATH79_MACH_JWAP003 is not set
 # CONFIG_ATH79_MACH_JWAP230 is not set
+# CONFIG_ATH79_MACH_KOALA is not set
 # CONFIG_ATH79_MACH_LAN_TURTLE is not set
 # CONFIG_ATH79_MACH_LIMA is not set
 # CONFIG_ATH79_MACH_MC_MAC1200R is not set
index 7400f2c86d455563a48d290d48b36420596225f8..72b3fe0aeae1dde14f5f89e0b72dfd51157bc6c5 100644 (file)
@@ -960,6 +960,16 @@ config ATH79_MACH_JWAP230
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
 
+config ATH79_MACH_KOALA
+       bool "OCEDO Koala board support"
+       select SOC_QCA955X
+       select ATH79_DEV_AP9X_PCI if PCI
+       select ATH79_DEV_GPIO_BUTTONS
+       select ATH79_DEV_ETH
+       select ATH79_DEV_LEDS_GPIO
+       select ATH79_DEV_M25P80
+       select ATH79_DEV_WMAC
+
 config ATH79_MACH_WAM250
        bool "Samsung WAM250 support"
        select SOC_AR934X
index b6c77b202986c2dedb1530c55af37799dad1eea0..cdd1d40c963a67ef90850fe1c2609ab648bd6334 100644 (file)
@@ -143,6 +143,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB)          += mach-hornet-ub.o
 obj-$(CONFIG_ATH79_MACH_JA76PF)                        += mach-ja76pf.o
 obj-$(CONFIG_ATH79_MACH_JWAP003)               += mach-jwap003.o
 obj-$(CONFIG_ATH79_MACH_JWAP230)               += mach-jwap230.o
+obj-$(CONFIG_ATH79_MACH_KOALA)                 += mach-koala.o
 obj-$(CONFIG_ATH79_MACH_LAN_TURTLE)            += mach-lan-turtle.o
 obj-$(CONFIG_ATH79_MACH_LIMA)                  += mach-lima.o
 obj-$(CONFIG_ATH79_MACH_MC_MAC1200R)           += mach-mc-mac1200r.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c
new file mode 100644 (file)
index 0000000..48354b4
--- /dev/null
@@ -0,0 +1,161 @@
+/*
+ * OCEDO Koala board support
+ * Based on the MR1750 machine file
+ *
+ * Copyright (c) 2012 Qualcomm Atheros
+ * Copyright (c) 2012-2013 Marek Lindner <marek@open-mesh.com>
+ * Copyright (c) 2018 David Bauer <mail@david-bauer.net>
+ *
+ * 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/ar8216_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+#include <linux/platform_data/phy-at803x.h>
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-eth.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define KOALA_GPIO_LED_POWER           22
+#define KOALA_GPIO_LED_WLAN_5G         13
+#define KOALA_GPIO_LED_WLAN_2G         23
+#define KOALA_GPIO_LED_WLAN_SYS                19
+
+#define KOALA_GPIO_BTN_RESET           17
+
+#define KOALA_KEYS_POLL_INTERVAL       20      /* msecs */
+#define KOALA_KEYS_DEBOUNCE_INTERVAL   (3 * KOALA_KEYS_POLL_INTERVAL)
+
+#define KOALA_LAN_MAC_OFFSET           0
+#define KOALA_WIFI2G_MAC_OFFSET                0x06
+#define KOALA_WMAC_CALDATA_OFFSET      0x1000
+
+static struct gpio_led koala_leds_gpio[] __initdata = {
+       {
+               .name           = "koala:green:power",
+               .gpio           = KOALA_GPIO_LED_POWER,
+               .active_low     = 1,
+       },
+       {
+               .name           = "koala:red:wlan58",
+               .gpio           = KOALA_GPIO_LED_WLAN_5G,
+               .active_low     = 1,
+       },
+       {
+               .name           = "koala:yellow:wlan2",
+               .gpio           = KOALA_GPIO_LED_WLAN_2G,
+               .active_low     = 1,
+       },
+       {
+               .name           = "koala:blue:sys",
+               .gpio           = KOALA_GPIO_LED_WLAN_SYS,
+               .active_low     = 1,
+               },
+};
+
+static struct gpio_keys_button koala_gpio_keys[] __initdata = {
+       {
+               .desc           = "Reset button",
+               .type           = EV_KEY,
+               .code           = KEY_RESTART,
+               .debounce_interval = KOALA_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = KOALA_GPIO_BTN_RESET,
+               .active_low     = 1,
+       },
+};
+
+static struct at803x_platform_data koala_at803x_data = {
+       .disable_smarteee = 1,
+       .enable_rgmii_rx_delay = 1,
+       .enable_rgmii_tx_delay = 0,
+       .fixup_rgmii_tx_delay = 1,
+};
+
+static struct mdio_board_info koala_mdio0_info[] = {
+       {
+               .bus_id = "ag71xx-mdio.0",
+               .phy_addr = 5,
+               .platform_data = &koala_at803x_data,
+       },
+};
+
+static void __init koala_setup_qca955x_eth_cfg(u32 mask,
+                                               unsigned int rxd,
+                                               unsigned int rxdv,
+                                               unsigned int txd,
+                                               unsigned int txe)
+{
+       void __iomem *base;
+       u32 t;
+
+       base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
+
+       t = mask;
+       t |= rxd << QCA955X_ETH_CFG_RXD_DELAY_SHIFT;
+       t |= rxdv << QCA955X_ETH_CFG_RDV_DELAY_SHIFT;
+       t |= txd << QCA955X_ETH_CFG_TXD_DELAY_SHIFT;
+       t |= txe << QCA955X_ETH_CFG_TXE_DELAY_SHIFT;
+
+       __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
+
+       iounmap(base);
+}
+
+static void __init koala_setup(void)
+{
+       u8 *art = (u8 *)KSEG1ADDR(0x1fff0000);
+       u8 mac[6];
+
+       ath79_eth0_pll_data.pll_1000 = 0xae000000;
+       ath79_eth0_pll_data.pll_100 = 0xa0000101;
+       ath79_eth0_pll_data.pll_10 = 0xa0001313;
+
+       ath79_register_m25p80(NULL);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(koala_leds_gpio),
+                                koala_leds_gpio);
+       ath79_register_gpio_keys_polled(-1, KOALA_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(koala_gpio_keys),
+                                       koala_gpio_keys);
+
+       ath79_init_mac(mac, art + KOALA_WIFI2G_MAC_OFFSET, 0);
+       ath79_register_wmac(art + KOALA_WMAC_CALDATA_OFFSET, mac);
+       ath79_register_pci();
+
+       koala_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN, 3, 3, 0, 0);
+       ath79_register_mdio(0, 0x0);
+
+       mdiobus_register_board_info(koala_mdio0_info,
+                                   ARRAY_SIZE(koala_mdio0_info));
+
+       ath79_init_mac(ath79_eth0_data.mac_addr, art + KOALA_LAN_MAC_OFFSET, 0);
+
+       /* GMAC0 is connected to the RMGII interface */
+       ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+       ath79_eth0_data.phy_mask = BIT(5);
+       ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+
+       ath79_register_eth(0);
+}
+
+MIPS_MACHINE(ATH79_MACH_KOALA, "KOALA", "OCEDO Koala", koala_setup);
index 1457d8b34737c821e48f8093bd81368adf8fc503..3a1f66cefd3a7599e782cec3d9df8f57c0e53683 100644 (file)
@@ -141,6 +141,7 @@ enum ath79_mach_type {
        ATH79_MACH_JA76PF2,                     /* jjPlus JA76PF2 */
        ATH79_MACH_JWAP003,                     /* jjPlus JWAP003 */
        ATH79_MACH_JWAP230,                     /* jjPlus JWAP230 */
+       ATH79_MACH_KOALA,                       /* OCEDO Koala */
        ATH79_MACH_LAN_TURTLE,                  /* Hak5 LAN Turtle */
        ATH79_MACH_LIMA,                        /* 8devices Lima */
        ATH79_MACH_MC_MAC1200R,                 /* MERCURY MAC1200R */
index 53281c12508cb819fd3b2c7d7497855c16512e63..0dc64165dea040d2c772177ca129f2d2cc1d9b64 100644 (file)
@@ -105,6 +105,7 @@ CONFIG_ATH79_MACH_HORNET_UB=y
 CONFIG_ATH79_MACH_JA76PF=y
 CONFIG_ATH79_MACH_JWAP003=y
 CONFIG_ATH79_MACH_JWAP230=y
+CONFIG_ATH79_MACH_KOALA=y
 CONFIG_ATH79_MACH_LAN_TURTLE=y
 CONFIG_ATH79_MACH_LIMA=y
 CONFIG_ATH79_MACH_MC_MAC1200R=y
index 3a7f6776b3411c56d20ebd926977bfb01c26428c..f5473126ddf16cb5565eddd067f3f0670821f10b 100644 (file)
@@ -26,3 +26,16 @@ define Device/ens202ext
   IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
 endef
 TARGET_DEVICES += ens202ext
+
+define Device/koala
+  DEVICE_TITLE := OCEDO Koala
+  BOARDNAME := KOALA
+  DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
+  KERNEL_SIZE := 1536k
+  IMAGE_SIZE := 7424k
+  MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),1536k(kernel),5888k(rootfs),1536k(kernel2),5888k(rootfs2),1088k(data)ro,64k(id)ro,64k(art)ro,7424k@0x50000(firmware)
+  KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
+  KERNEL_INITRAMFS := $$(KERNEL)
+  IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
+endef
+TARGET_DEVICES += koala