ar71xx: add support for the Airtight C-60
authorChristian Lamparter <chunkeey@googlemail.com>
Wed, 5 Oct 2016 12:53:11 +0000 (14:53 +0200)
committerJohn Crispin <john@phrozen.org>
Sat, 15 Oct 2016 09:36:50 +0000 (11:36 +0200)
This patch adds support for the Airtight C-60.

SOC: Atheros AR9344 rev 2 (CPU:560.000MHz)
RAM: 128 MiB
NOR: MX25L3205D 4MiB
NAND: ST Micro NAND 32MiB 3,3V 8-bit
SW-NET: AR8327N (2 Ports)
WLAN1: Dual-Band AR9340 Rev:2 (built-in SoC)
WLAN2: Dual-Band AR9300 Rev:4 PCIe Chip

The switch is setup for an accesspoint:
LAN1: (gigabit) is the wan-port.
LAN2: (fast ethernet) is bridged with the br-lan.

Flashing Guide (via initramfs):
  1. Connect a PC to the serial port of the C-60.
     power up the C-60.

     Enter u-boot command prompt:
     #> nand erase
     #> setenv bootcmd "bootm 0x9f060000"
     #> saveenv
     #> setenv ipaddr 192.168.1.1
     #> setenv netmask 255.255.255.0
     #> setenv serverip 192.168.1.100
     #> setenv bootfile lede-ar71xx-nand-c-60-initramfs-kernel.bin
     #> tftpboot
     #> bootm

  2. Wait for the C-60 to boot LEDE.
     On the root prompt. Enter:
     # ubiformat /dev/mtd4
     # ubiattach -p /dev/mtd4

  3. After that copy the sysupgrade.tar onto the router and run:
     # sysupgrade sysupgrade.tar

     to flash the image.

Special thanks to Chris Blake <chrisrblake93@gmail.com>. He provided
a C-60 unit and he helped with debugging the switch, LEDs and platfrom
support.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
13 files changed:
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/10-ath9k-eeprom
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
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-c60.c [new file with mode: 0644]
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
target/linux/ar71xx/image/nand.mk

index 308a050..5011af6 100755 (executable)
@@ -92,6 +92,10 @@ c-55)
        ucidef_set_led_wlan "wlan_amber" "WLAN_AMBER" "$board:amber:wlan" "phy0tpt"
        ucidef_set_led_wlan "wlan_green" "WLAN_GREEN" "$board:green:wlan" "phy1tpt"
        ;;
+c-60)
+       ucidef_set_led_wlan "wlan1_green" "WLAN1_GREEN" "$board:green:wlan1" "phy0tpt"
+       ucidef_set_led_wlan "wlan2_green" "WLAN2_GREEN" "$board:green:wlan2" "phy1tpt"
+       ;;
 cap4200ag)
        ucidef_set_led_default "lan_green" "LAN_GREEN" "senao:green:lan" "1"
        ucidef_set_led_wlan "wlan_amber" "WLAN_AMBER" "senao:amber:wlan" "phy0tpt"
index 4ef43cf..f720767 100755 (executable)
@@ -199,6 +199,10 @@ ar71xx_setup_interfaces()
                ucidef_add_switch "switch0" \
                        "0@eth1" "1:lan" "3:lan"
                ;;
+       c-60)
+               ucidef_add_switch "switch0" \
+                       "0@eth0" "3:wan" "4:lan"
+               ;;
        cap324)
                ucidef_set_interface_lan "eth0" "dhcp"
                ;;
index d5ddb51..0d069ec 100644 (file)
@@ -73,7 +73,8 @@ get_status_led() {
        cap324)
                status_led="pcs:green:power"
                ;;
-       c-55)
+       c-55|\
+       c-60)
                status_led="$board:green:pwr"
                ;;
        cap4200ag)
index 3141625..945167b 100644 (file)
@@ -53,7 +53,8 @@ board=$(ar71xx_board_name)
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
        case $board in
-       c-55)
+       c-55|\
+       c-60)
                ath9k_eeprom_extract "art" 4096 2048
                ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary art 0) +1)
                ;;
index a8ea7d4..940c1c9 100755 (executable)
@@ -482,6 +482,9 @@ ar71xx_board_detect() {
        *C-55)
                name="c-55"
                ;;
+       *C-60)
+               name="c-60"
+               ;;
        *CAP4200AG)
                name="cap4200ag"
                ;;
index 60e2787..50f59de 100644 (file)
@@ -22,7 +22,8 @@ fetch_mac_from_mtd() {
 
 preinit_set_mac_address() {
        case $(ar71xx_board_name) in
-               c-55)
+               c-55|\
+               c-60)
                        mac_lan=$(mtd_get_mac_binary art 0)
                        [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan"
                        ;;
index 010442c..7c554e3 100755 (executable)
@@ -424,6 +424,14 @@ platform_check_image() {
        tew-673gru)
                dir825b_check_image "$1" && return 0
                ;;
+       c-60|\
+       nbg6716|\
+       r6100|\
+       wndr3700v4|\
+       wndr4300)
+               nand_do_platform_check $board $1
+               return $?
+               ;;
        cpe210|\
        cpe510)
                tplink_pharos_check_image "$1" && return 0
@@ -485,13 +493,6 @@ platform_check_image() {
 
                return 0
                ;;
-       nbg6716|\
-       r6100|\
-       wndr3700v4|\
-       wndr4300)
-               nand_do_platform_check $board $1
-               return $?
-               ;;
        tube2h)
                alfa_check_image "$1" && return 0
                return 1
@@ -537,16 +538,17 @@ platform_pre_upgrade() {
        local board=$(ar71xx_board_name)
 
        case "$board" in
-       mr18|\
-       z1)
-               merakinand_do_upgrade "$1"
-               ;;
+       c-60|\
        nbg6716|\
        r6100|\
        wndr3700v4|\
        wndr4300)
                nand_do_upgrade "$1"
                ;;
+       mr18|\
+       z1)
+               merakinand_do_upgrade "$1"
+               ;;
        esac
 }
 
index 9f4c16e..fb59b07 100644 (file)
@@ -56,6 +56,7 @@ CONFIG_ATH79_MACH_AW_NR580=y
 CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y
 CONFIG_ATH79_MACH_BSB=y
 CONFIG_ATH79_MACH_C55=y
+CONFIG_ATH79_MACH_C60=y
 CONFIG_ATH79_MACH_CAP324=y
 CONFIG_ATH79_MACH_CAP4200AG=y
 CONFIG_ATH79_MACH_CARAMBOLA2=y
index 119bfd1..3084155 100644 (file)
@@ -210,6 +210,18 @@ config ATH79_MACH_C55
        select ATH79_DEV_M25P80
        select ATH79_DEV_WMAC
 
+config ATH79_MACH_C60
+       bool "AirTight Networks C-60 support"
+       select SOC_AR934X
+       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
+       select ATH79_DEV_NFC
+       select ATH79_DEV_USB
+
 config ATH79_MACH_AW_NR580
        bool "AzureWave AW-NR580 board support"
        select SOC_AR71XX
index 8d67723..ed5c4d8 100644 (file)
@@ -62,6 +62,7 @@ obj-$(CONFIG_ATH79_MACH_AW_NR580)             += mach-aw-nr580.o
 obj-$(CONFIG_ATH79_MACH_BHU_BXU2000N2_A)       += mach-bhu-bxu2000n2-a.o
 obj-$(CONFIG_ATH79_MACH_BSB)                   += mach-bsb.o
 obj-$(CONFIG_ATH79_MACH_C55)                   += mach-c55.o
+obj-$(CONFIG_ATH79_MACH_C60)                   += mach-c60.o
 obj-$(CONFIG_ATH79_MACH_CAP324)                        += mach-cap324.o
 obj-$(CONFIG_ATH79_MACH_CAP4200AG)             += mach-cap4200ag.o
 obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)            += mach-carambola2.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
new file mode 100644 (file)
index 0000000..2a9e721
--- /dev/null
@@ -0,0 +1,200 @@
+/*
+ *  AirTight Networks C-60 board support
+ *
+ *  Copyright (C) 2016 Christian Lamparter <chunkeey@googlemail.com>
+ *
+ *  Based on AirTight Networks C-55 board support
+ *
+ *  Copyright (C) 2014-2015 Chris Blake <chrisrblake93@gmail.com>
+ *
+ *  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 <linux/pci.h>
+#include <linux/phy.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <linux/platform/ar934x_nfc.h>
+#include <linux/ar8216_platform.h>
+#include <linux/ath9k_platform.h>
+
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#include "common.h"
+#include "pci.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-spi.h"
+#include "dev-wmac.h"
+#include "dev-usb.h"
+#include "dev-nfc.h"
+#include "machtypes.h"
+
+#define C60_GPIO_LED_PWR_AMBER         11
+#define C60_GPIO_LED_WLAN2_GREEN       12
+#define C60_GPIO_LED_WLAN2_AMBER       13
+#define C60_GPIO_LED_PWR_GREEN         16
+
+#define C60_GPIO_BTN_RESET             17
+
+/* GPIOs of the AR9300 PCIe chip */
+#define C60_GPIO_WMAC_LED_WLAN1_AMBER  0
+#define C60_GPIO_WMAC_LED_WLAN1_GREEN  3
+
+#define C60_KEYS_POLL_INTERVAL         20      /* msecs */
+#define C60_KEYS_DEBOUNCE_INTERVAL (3 * C60_KEYS_POLL_INTERVAL)
+
+#define C60_ART_ADDR                   0x1f7f0000
+#define C60_ART_SIZE                   0xffff
+#define C60_MAC_OFFSET                 0
+#define C60_WMAC_CALDATA_OFFSET                0x1000
+#define C60_PCIE_CALDATA_OFFSET                0x5000
+
+static struct gpio_led c60_leds_gpio[] __initdata = {
+       {
+               .name           = "c-60:amber:pwr",
+               .gpio           = C60_GPIO_LED_PWR_AMBER,
+               .active_low     = 1,
+       },
+       {
+               .name           = "c-60:green:pwr",
+               .gpio           = C60_GPIO_LED_PWR_GREEN,
+               .active_low     = 1,
+       },
+       {
+               .name           = "c-60:green:wlan2",
+               .gpio           = C60_GPIO_LED_WLAN2_GREEN,
+               .active_low     = 1,
+       },
+       {
+               .name           = "c-60:amber:wlan2",
+               .gpio           = C60_GPIO_LED_WLAN2_AMBER,
+               .active_low     = 1,
+       },
+};
+
+static struct gpio_keys_button c60_gpio_keys[] __initdata = {
+       {
+               .desc           = "Reset button",
+               .type           = EV_KEY,
+               .code           = KEY_RESTART,
+               .debounce_interval = C60_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = C60_GPIO_BTN_RESET,
+               .active_low     = 1,
+       },
+};
+
+static struct ar8327_pad_cfg c60_ar8327_pad0_cfg = {
+       .mode = AR8327_PAD_MAC_RGMII,
+       .txclk_delay_en = true,
+       .rxclk_delay_en = true,
+       .txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
+       .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
+};
+
+static struct ar8327_platform_data c60_ar8327_data = {
+       .pad0_cfg = &c60_ar8327_pad0_cfg,
+       .port0_cfg = {
+               .force_link = 1,
+               .speed = AR8327_PORT_SPEED_1000,
+               .duplex = 1,
+               .txpause = 1,
+               .rxpause = 1,
+       }
+};
+
+static struct mdio_board_info c60_mdio0_info[] = {
+       {
+               .bus_id = "ag71xx-mdio.0",
+               .phy_addr = 0,
+               .platform_data = &c60_ar8327_data,
+       },
+};
+
+static struct nand_ecclayout c60_nand_ecclayout = {
+       .eccbytes       = 7,
+       .eccpos         = { 4, 8, 9, 10, 13, 14, 15 },
+       .oobavail       = 9,
+       .oobfree        = { { 0, 3 }, { 6, 2 }, { 11, 2 }, }
+};
+
+static int c60_nand_scan_fixup(struct mtd_info *mtd)
+{
+       struct nand_chip *chip = mtd->priv;
+
+       chip->ecc.size = 512;
+       chip->ecc.strength = 4;
+       chip->ecc.layout = &c60_nand_ecclayout;
+       return 0;
+}
+
+static struct gpio_led c60_wmac0_leds_gpio[] = {
+       {
+               .name           = "c-60:amber:wlan1",
+               .gpio           = C60_GPIO_WMAC_LED_WLAN1_AMBER,
+               .active_low     = 1,
+       },
+       {
+               .name           = "c-60:green:wlan1",
+               .gpio           = C60_GPIO_WMAC_LED_WLAN1_GREEN,
+               .active_low     = 1,
+       },
+};
+
+static void __init c60_setup(void)
+{
+       u8 tmpmac[6];
+       u8 *art = (u8 *) KSEG1ADDR(C60_ART_ADDR);
+
+       /* NAND */
+       ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_SOFT_BCH);
+       ath79_nfc_set_scan_fixup(c60_nand_scan_fixup);
+       ath79_register_nfc();
+
+       /* SPI Storage*/
+       ath79_register_m25p80_large(NULL);
+
+       /* AR8327 Switch Ethernet */
+
+       ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0);
+
+       mdiobus_register_board_info(c60_mdio0_info,
+                                   ARRAY_SIZE(c60_mdio0_info));
+
+       ath79_register_mdio(0, 0x0);
+
+       /* GMAC0 is connected to an AR8327N switch */
+       ath79_init_mac(ath79_eth0_data.mac_addr, art + C60_MAC_OFFSET, 0);
+       ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+       ath79_eth0_data.phy_mask = BIT(0);
+       ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
+       ath79_eth0_pll_data.pll_1000 = 0x06000000;
+       ath79_register_eth(0);
+
+       /* LEDs & GPIO */
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(c60_leds_gpio),
+                                c60_leds_gpio);
+       ath79_register_gpio_keys_polled(-1, C60_KEYS_POLL_INTERVAL,
+                                       ARRAY_SIZE(c60_gpio_keys),
+                                       c60_gpio_keys);
+       ap9x_pci_setup_wmac_leds(0, c60_wmac0_leds_gpio,
+                                ARRAY_SIZE(c60_wmac0_leds_gpio));
+       /* USB */
+       ath79_register_usb();
+
+       /* WiFi */
+       ath79_init_mac(tmpmac, art + C60_MAC_OFFSET, 1);
+       ap91_pci_init(art + C60_PCIE_CALDATA_OFFSET, tmpmac);
+       ath79_init_mac(tmpmac, art + C60_MAC_OFFSET, 2);
+       ath79_register_wmac(art + C60_WMAC_CALDATA_OFFSET, tmpmac);
+}
+MIPS_MACHINE(ATH79_MACH_C60, "C-60", "AirTight Networks C-60",
+            c60_setup);
index faba2b6..8835b97 100644 (file)
@@ -47,6 +47,7 @@ enum ath79_mach_type {
        ATH79_MACH_BHU_BXU2000N2_A1,            /* BHU BXU2000n-2 A1 */
        ATH79_MACH_BSB,                         /* Smart Electronics Black Swift board */
        ATH79_MACH_C55,                         /* AirTight Networks C-55 */
+       ATH79_MACH_C60,                         /* AirTight Networks C-60 */
        ATH79_MACH_CAP324,                      /* PowerCloud CAP324 */
        ATH79_MACH_CAP4200AG,                   /* Senao CAP4200AG */
        ATH79_MACH_CARAMBOLA2,                  /* 8devices Carambola2 */
index aa431ac..c08081b 100644 (file)
@@ -1,3 +1,18 @@
+define Device/c-60
+  DEVICE_TITLE := AirTight C-60
+  DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-core kmod-usb2 kmod-ath9k
+  BOARDNAME = C-60
+  BLOCKSIZE := 64k
+  KERNEL_SIZE = 3648k
+  IMAGE_SIZE = 32m
+  IMAGES := sysupgrade.tar
+  MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,3648k(kernel),64k(art)ro;ar934x-nfc:32m(ubi)
+  KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
+  IMAGE/sysupgrade.tar := sysupgrade-tar
+endef
+
+TARGET_DEVICES += c-60
+
 define Build/MerakiNAND
        -$(STAGING_DIR_HOST)/bin/mkmerakifw \
                -B $(BOARDNAME) -s \