From patchwork Thu Dec 17 18:17:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris X-Patchwork-Id: 558540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F21BF1402C4 for ; Fri, 18 Dec 2015 05:19:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=YqHn+pvY; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AAA3C28BE08; Thu, 17 Dec 2015 19:17:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8E09028BC51 for ; Thu, 17 Dec 2015 19:17:33 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-ig0-f176.google.com (mail-ig0-f176.google.com [209.85.213.176]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 17 Dec 2015 19:17:32 +0100 (CET) Received: by mail-ig0-f176.google.com with SMTP id to4so18389376igc.0 for ; Thu, 17 Dec 2015 10:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZwJW4FV0ANA2Xmfq8EPfgNdTaTn2qMwmxsaGy6p9qe0=; b=YqHn+pvYo4hKfOCaRFwPVXKMPtt6UOQnU4uW4dRsad33zsipRdlIg7JHPv0+QC0RLa EGqBfAbGHRBpEBETloglw3thAE+Da5276GR1ieJ7kiygkTod/iOv8pyMIzBTmnbuSD/G 0HkBDvHYv94Bf2eJ0Eet5+WxLw26+DxP6mi1cu+KVYJfdQnAYm2IHTzPYx47j7v6qq8r EkMt5G6Oze/hjLogBeiRKHWgmJ3bddldPrPbh/vAA5TX3yQbl+d77QCAZ+05m1zBD4Ww GJ/lGoKD+lrx8aZsISKOUoVGEWoV5Vc/UkKVLFX/gM+kk7hghofcvcore/yh0omvZ5mo Slog== X-Received: by 10.50.141.161 with SMTP id rp1mr5181792igb.28.1450376265843; Thu, 17 Dec 2015 10:17:45 -0800 (PST) Received: from build01.chrisrblake.com (build01.chrisrblake.com. [159.203.29.144]) by smtp.gmail.com with ESMTPSA id s6sm1927309ioe.43.2015.12.17.10.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 10:17:45 -0800 (PST) From: Chris Blake To: openwrt-devel@lists.openwrt.org Date: Thu, 17 Dec 2015 13:17:39 -0500 Message-Id: <1450376259-8636-3-git-send-email-chrisrblake93@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450376259-8636-1-git-send-email-chrisrblake93@gmail.com> References: <1450376259-8636-1-git-send-email-chrisrblake93@gmail.com> Subject: [OpenWrt-Devel] [PATCH v4 2/2] ar71xx: Add support for AirTight Networks C-55 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This patch is to add support for the AirTight Networks C-55 Access Point Signed-off-by: Chris R Blake --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 6 + .../linux/ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/etc/diag.sh | 3 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 8 ++ target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../base-files/lib/preinit/05_set_iface_mac_ar71xx | 5 +- .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.1 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 10 ++ target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../linux/ar71xx/files/arch/mips/ath79/mach-c55.c | 132 +++++++++++++++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/generic/profiles/airtight.mk | 17 +++ target/linux/ar71xx/image/Makefile | 10 ++ 14 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-c55.c create mode 100644 target/linux/ar71xx/generic/profiles/airtight.mk 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 ed2aeae..11d5418 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -92,6 +92,12 @@ bxu2000n-2-a1) ucidef_set_led_wlan "wlan" "WLAN" "bhu:green:wlan" "phy0tpt" ;; +c-55) + ucidef_set_led_netdev "lan_green" "LAN_GREEN" "c-55:green:lan" "eth0" + ucidef_set_led_wlan "wlan_amber" "WLAN_AMBER" "c-55:amber:wlan" "phy0tpt" + ucidef_set_led_wlan "wlan_green" "WLAN_GREEN" "c-55:green:wlan" "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" 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 bfc898c..6874486 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -308,6 +308,7 @@ antminer-s1 |\ antminer-s3 |\ aw-nr580 |\ bullet-m |\ +c-55 |\ cap4200ag |\ eap300v2 |\ eap7660d |\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index fd57c55..b5a9fff 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -55,6 +55,9 @@ get_status_led() { bxu2000n-2-a1) status_led="bhu:green:status" ;; + c-55) + status_led="c-55:green:pwr" + ;; cap4200ag) status_led="senao:green:pwr" ;; diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 5398e76..807d4a9 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -38,6 +38,10 @@ board=$(ar71xx_board_name) case "$FIRMWARE" in "soc_wmac.eeprom") case $board in + c-55) + ath9k_eeprom_extract "art" 4096 2048 + ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary art 0) +1) + ;; mr18) if [ -n "$(nand_find_volume ubi0 caldata)" ]; then ath9k_ubi_eeprom_extract "caldata" 4096 2048 @@ -60,6 +64,10 @@ case "$FIRMWARE" in "pci_wmac0.eeprom") case $board in + c-55) + ath9k_eeprom_extract "art" 20480 2048 + ath9k_patch_firmware_mac $(macaddr_add $(mtd_get_mac_binary art 0) +2) + ;; mr18) if [ -n "$(nand_find_volume ubi0 caldata)" ]; then ath9k_ubi_eeprom_extract "caldata" 20480 2048 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 5af7adf..026c576 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -411,6 +411,9 @@ ar71xx_board_detect() { *AW-NR580) name="aw-nr580" ;; + *C-55) + name="c-55" + ;; *CAP4200AG) name="cap4200ag" ;; diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx index a9f4bf5..39da309 100644 --- a/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx +++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx @@ -22,6 +22,10 @@ fetch_mac_from_mtd() { preinit_set_mac_address() { case $(ar71xx_board_name) in + c-55) + mac_lan=$(mtd_get_mac_binary art 0) + [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan" + ;; dir-615-c1) fetch_mac_from_mtd config lan_mac wan_mac echo 1 > /sys/class/leds/dir-615-c1:green:wancpu/brightness @@ -49,4 +53,3 @@ preinit_set_mac_address() { } boot_hook_add preinit_main preinit_set_mac_address - diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 7e564b4..e911092 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -201,6 +201,7 @@ platform_check_image() { ap81 | \ ap83 | \ ap132 | \ + c-55 | \ cf-e316n-v2 | \ dgl-5500-a1 |\ dhp-1565-a1 |\ diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index 15754d9..79cf2df 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -50,6 +50,7 @@ CONFIG_ATH79_MACH_ARDUINO_YUN=y 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_CAP4200AG=y CONFIG_ATH79_MACH_CARAMBOLA2=y CONFIG_ATH79_MACH_CF_E316N_V2=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index d619b3c..be74d3f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -182,6 +182,16 @@ config ATH79_MACH_PB92 select ATH79_DEV_PB9X_PCI if PCI select ATH79_DEV_USB +config ATH79_MACH_C55 + bool "AirTight Networks C-55 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 + config ATH79_MACH_AW_NR580 bool "AzureWave AW-NR580 board support" select SOC_AR71XX diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 9f67bd8..3fbe1a3 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -114,6 +114,7 @@ obj-$(CONFIG_ATH79_MACH_ONION_OMEGA) += mach-onion-omega.o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o obj-$(CONFIG_ATH79_MACH_PB92) += mach-pb92.o +obj-$(CONFIG_ATH79_MACH_C55) += mach-c55.o obj-$(CONFIG_ATH79_MACH_QIHOO_C301) += mach-qihoo-c301.o obj-$(CONFIG_ATH79_MACH_R6100) += mach-r6100.o obj-$(CONFIG_ATH79_MACH_RB4XX) += mach-rb4xx.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-c55.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-c55.c new file mode 100644 index 0000000..cbee18e --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-c55.c @@ -0,0 +1,132 @@ +/* + * AirTight Networks C-55 board support + * + * Copyright (C) 2014-2015 Chris Blake + * + * Based on Senao CAP4200AG board support + * + * Copyright (C) 2012 Gabor Juhos + * + * 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 + +#include + +#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 "machtypes.h" + +#define C55_GPIO_LED_PWR_GREEN 12 +#define C55_GPIO_LED_PWR_AMBER 13 +#define C55_GPIO_LED_LAN_GREEN 14 +#define C55_GPIO_LED_LAN_AMBER 15 +#define C55_GPIO_LED_WLAN_GREEN 18 +#define C55_GPIO_LED_WLAN_AMBER 19 + +#define C55_GPIO_BTN_RESET 17 + +#define C55_KEYS_POLL_INTERVAL 20 /* msecs */ +#define C55_KEYS_DEBOUNCE_INTERVAL (3 * C55_KEYS_POLL_INTERVAL) + +#define C55_MAC_OFFSET 0 +#define C55_WMAC_CALDATA_OFFSET 0x1000 +#define C55_PCIE_CALDATA_OFFSET 0x5000 + +static struct gpio_led c55_leds_gpio[] __initdata = { + { + .name = "c-55:green:pwr", + .gpio = C55_GPIO_LED_PWR_GREEN, + .active_low = 1, + }, + { + .name = "c-55:amber:pwr", + .gpio = C55_GPIO_LED_PWR_AMBER, + .active_low = 1, + }, + { + .name = "c-55:green:lan", + .gpio = C55_GPIO_LED_LAN_GREEN, + .active_low = 1, + }, + { + .name = "c-55:amber:lan", + .gpio = C55_GPIO_LED_LAN_AMBER, + .active_low = 1, + }, + { + .name = "c-55:green:wlan", + .gpio = C55_GPIO_LED_WLAN_GREEN, + .active_low = 1, + }, + { + .name = "c-55:amber:wlan", + .gpio = C55_GPIO_LED_WLAN_AMBER, + .active_low = 1, + }, +}; + +static struct gpio_keys_button c55_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = C55_KEYS_DEBOUNCE_INTERVAL, + .gpio = C55_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static void __init c55_setup(void) +{ + /* SPI Storage*/ + ath79_register_m25p80_large(NULL); + + /* MDIO Interface */ + ath79_register_mdio(0, 0x0); + + /* AR8035-A Ethernet */ + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | + AR934X_ETH_CFG_SW_ONLY_MODE); + ath79_init_mac(ath79_eth0_data.mac_addr, NULL, 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_gpio_output_select(C55_GPIO_LED_LAN_GREEN, + AR934X_GPIO_OUT_GPIO); + ath79_gpio_output_select(C55_GPIO_LED_LAN_AMBER, + AR934X_GPIO_OUT_GPIO); + ath79_register_leds_gpio(-1, ARRAY_SIZE(c55_leds_gpio), + c55_leds_gpio); + ath79_register_gpio_keys_polled(-1, C55_KEYS_POLL_INTERVAL, + ARRAY_SIZE(c55_gpio_keys), + c55_gpio_keys); + + /* WiFi */ + ath79_wmac_disable_2ghz(); + ath79_register_wmac_simple(); + ap91_pci_init_simple(); + +} +MIPS_MACHINE(ATH79_MACH_C55, "C-55", "AirTight Networks C-55", + c55_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index fc3eeaf..48b0962 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -42,6 +42,7 @@ enum ath79_mach_type { ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ 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_CAP4200AG, /* Senao CAP4200AG */ ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */ ATH79_MACH_CF_E316N_V2, /* COMFAST CF-E316N v2 */ diff --git a/target/linux/ar71xx/generic/profiles/airtight.mk b/target/linux/ar71xx/generic/profiles/airtight.mk new file mode 100644 index 0000000..00f9ce4 --- /dev/null +++ b/target/linux/ar71xx/generic/profiles/airtight.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2015 Chris Blake (chrisrblake93@gmail.com) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/C-55 + NAME:=AirTight Networks C-55 + PACKAGES:=kmod-ath9k +endef + +define Profile/C-55/Description + Package set optimized for the AirTight Networks C-55 AP. +endef + +$(eval $(call Profile,C-55)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 10de223..fcf462a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -2256,6 +2256,16 @@ $(eval $(call BuildTemplate,256k,,256k)) $(eval $(call BuildTemplate,all,,64k 128k 256k)) ifeq ($(SUBTARGET),generic) +define Device/c-55 + BOARDNAME = C-55 + KERNEL_SIZE = 2048k + IMAGE_SIZE = 15872k + MTDPARTS = spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,2048k(kernel),13824k(rootfs),13824k(opt)ro,2624k(failsafe)ro,64k(art)ro,15872k@0x60000(firmware) + IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) +endef + +TARGET_DEVICES += c-55 + $(eval $(call SingleProfile,ALFA,64k,ALFANX,alfa-nx,ALFA-NX,ttyS0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2)) $(eval $(call SingleProfile,ALFA,64k,HORNETUB,hornet-ub,HORNET-UB,ttyATH0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,kernel_image,rootfs_image)) $(eval $(call SingleProfile,ALFA,64k,TUBE2H8M,tube2h-8M,TUBE2H,ttyATH0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,kernel.image,rootfs.image))