From e6087875b68b0dc743ff1d3328777c036e95567b Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 23 Mar 2016 22:37:02 +0000 Subject: [PATCH 1/1] ar71xx: add support for ap120c Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49084 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ar71xx/base-files/etc/uci-defaults/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + target/linux/ar71xx/config-3.18 | 1 + .../files/arch/mips/ath79/mach-alfa-ap120c.c | 147 +++++++++++++++++++++ target/linux/ar71xx/generic/profiles/alfa.mk | 12 ++ target/linux/ar71xx/image/Makefile | 2 + .../610-MIPS-ath79-openwrt-machines.patch | 25 +++- 7 files changed, 184 insertions(+), 7 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 5a74461a0f..c0becfecb9 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -322,6 +322,7 @@ dlan-pro-1200-ac) ucidef_add_switch_vlan "switch0" "0" "0 2 3 4" ;; +alfa-ap120c |\ all0305 |\ antminer-s1 |\ antminer-s3 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index d0abf42a5c..7cfd319149 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -333,6 +333,9 @@ ar71xx_board_detect() { *"ALFA Network AP96") name="alfa-ap96" ;; + *"ALFA Network AP120C") + name="alfa-ap120c" + ;; *"ALFA Network N2/N5") name="alfa-nx" ;; diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18 index 84b5844d3b..96a5ae232c 100644 --- a/target/linux/ar71xx/config-3.18 +++ b/target/linux/ar71xx/config-3.18 @@ -27,6 +27,7 @@ CONFIG_ATH79_DEV_NFC=y CONFIG_ATH79_DEV_SPI=y CONFIG_ATH79_DEV_USB=y CONFIG_ATH79_DEV_WMAC=y +CONFIG_ATH79_MACH_ALFA_AP120C=y CONFIG_ATH79_MACH_ALFA_AP96=y CONFIG_ATH79_MACH_ALFA_NX=y CONFIG_ATH79_MACH_ALL0258N=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c new file mode 100644 index 0000000000..f71275c035 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c @@ -0,0 +1,147 @@ +/* + * ALFA Network AP120C board support + * + * Copyright (C) 2012 Gabor Juhos + * Copyright (C) 2016 Luka Perkov + * + * 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 + +#include "common.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-ap9x-pci.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define ALFA_AP120C_GPIO_LED 0 + +#define ALFA_AP120C_GPIO_BUTTON_WIFI 16 + +#define ALFA_AP120C_GPIO_WATCH_DOG 20 + +#define ALFA_AP120C_KEYS_POLL_INTERVAL 20 /* msecs */ +#define ALFA_AP120C_KEYS_DEBOUNCE_INTERVAL (3 * ALFA_AP120C_KEYS_POLL_INTERVAL) + +#define ALFA_AP120C_MAC_OFFSET 0x1002 +#define ALFA_AP120C_CAL0_OFFSET 0x1000 + +static struct gpio_keys_button alfa_ap120c_gpio_keys[] __initdata = { + { + .desc = "Wireless button", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = ALFA_AP120C_KEYS_DEBOUNCE_INTERVAL, + .gpio = ALFA_AP120C_GPIO_BUTTON_WIFI, + .active_low = 1, + } +}; + +static struct gpio_led alfa_ap120c_leds_gpio[] __initdata = { + { + .name = "ap120c:red:wlan", + .gpio = ALFA_AP120C_GPIO_LED, + .active_low = 0, + } +}; + +static struct ar8327_pad_cfg ap120c_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 ap120c_ar8327_data = { + .pad0_cfg = &ap120c_ar8327_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + +static struct mdio_board_info ap120c_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &ap120c_ar8327_data, + }, +}; + +static struct flash_platform_data flash __initdata = { NULL, NULL, 0 }; + +#define ALFA_AP120C_LAN_PHYMASK BIT(5) +#define ALFA_AP120C_MDIO_PHYMASK ALFA_AP120C_LAN_PHYMASK + +static void __init alfa_ap120c_init(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 mac[ETH_ALEN]; + + struct ath9k_platform_data *pdata; + + ath79_register_leds_gpio(-1, ARRAY_SIZE(alfa_ap120c_leds_gpio), + alfa_ap120c_leds_gpio); + ath79_register_gpio_keys_polled(-1, ALFA_AP120C_KEYS_POLL_INTERVAL, + ARRAY_SIZE(alfa_ap120c_gpio_keys), + alfa_ap120c_gpio_keys); + + ath79_gpio_function_enable(AR71XX_GPIO_FUNC_SPI_CS1_EN | + AR71XX_GPIO_FUNC_SPI_CS2_EN); + + ath79_register_m25p80_multi(&flash); + + ath79_init_mac(mac, art + ALFA_AP120C_MAC_OFFSET, 1); + ath79_register_wmac(art + ALFA_AP120C_CAL0_OFFSET, mac); + + ath79_init_mac(mac, art + ALFA_AP120C_MAC_OFFSET, 2); + ap91_pci_init(NULL, mac); + pdata = ap9x_pci_get_wmac_data(0); + if (!pdata) { + pr_err("ap120c: unable to get address of wlan data\n"); + return; + } + pdata->use_eeprom = true; + + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 | + BIT(15) | BIT(17) | BIT(19) | BIT(21)); + + ath79_register_mdio(0, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, art + ALFA_AP120C_MAC_OFFSET, 0); + + mdiobus_register_board_info(ap120c_mdio0_info, ARRAY_SIZE(ap120c_mdio0_info)); + + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; + ath79_eth0_data.phy_mask = ALFA_AP120C_LAN_PHYMASK; + + ath79_eth0_pll_data.pll_1000 = 0x42000000; + ath79_eth0_pll_data.pll_10 = 0x00001313; + + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + + ath79_register_eth(0); +} + +MIPS_MACHINE(ATH79_MACH_ALFA_AP120C, "ALFA-AP120C", "ALFA Network AP120C", + alfa_ap120c_init); diff --git a/target/linux/ar71xx/generic/profiles/alfa.mk b/target/linux/ar71xx/generic/profiles/alfa.mk index 6e259dc602..397e96192f 100644 --- a/target/linux/ar71xx/generic/profiles/alfa.mk +++ b/target/linux/ar71xx/generic/profiles/alfa.mk @@ -17,6 +17,18 @@ endef $(eval $(call Profile,ALFAAP96)) +define Profile/ALFAAP120C + NAME:=ALFA Network AP120C board + PACKAGES:=uboot-envtools +endef + +define Profile/ALFAAP120C/Description + Package set optimized for the ALFA Network AP120C board. +endef + +$(eval $(call Profile,ALFAAP120C)) + + define Profile/HORNETUB NAME:=ALFA Network Hornet-UB board (8MB flash, 32MB ram) PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index f3aaadb910..d00b9be939 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -973,6 +973,7 @@ endef alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware) +alfa_ap120c_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,13312k(rootfs),1536k(kernel),1152k(unknown)ro,64k(art)ro;spi0.1:-(unknown) alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) alfa_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro all0258n_mtdlayout=mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),6272k(firmware),1536k(failsafe),64k(art) @@ -1893,6 +1894,7 @@ $(eval $(call SingleProfile,AthGzip,64k,AP96,ap96,AP96,ttyS0,115200,$$(ap96_mtdl $(eval $(call SingleProfile,AthGzip,64k,WNDAP360,wndap360,WNDAP360,ttyS0,9600,$$(wndap360_mtdlayout),KRuImage)) $(eval $(call SingleProfile,AthLzma,64k,ALFAAP96,alfa-ap96,ALFA-AP96,ttyS0,115200,$$(alfa_ap96_mtdlayout),RKuImage)) +$(eval $(call SingleProfile,AthLzma,64k,ALFAAP120C,alfa-ap120c,ALFA-AP120C,ttyS0,115200,$$(alfa_ap120c_mtdlayout),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,ALL0258N,all0258n,ALL0258N,ttyS0,115200,$$(all0258n_mtdlayout),KRuImage,65536)) $(eval $(call SingleProfile,AthLzma,256k,ALL0315N,all0315n,ALL0315N,ttyS0,115200,$$(all0315n_mtdlayout),KRuImage,262144)) $(eval $(call SingleProfile,AthLzma,64k,AP113,ap113,AP113,ttyS0,115200,$$(ap113_mtd_layout),RK)) diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch index f181f6cc11..18f8de9f68 100644 --- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch @@ -1,10 +1,11 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -16,22 +16,198 @@ +@@ -16,22 +16,199 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, + ATH79_MACH_ALFA_AP96, /* ALFA Network AP96 board */ ++ ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120C board */ + ATH79_MACH_ALFA_NX, /* ALFA Network N2/N5 board */ + ATH79_MACH_ALL0258N, /* Allnet ALL0258N */ + ATH79_MACH_ALL0305, /* Allnet ALL0305 */ @@ -201,7 +202,7 @@ #endif /* _ATH79_MACHTYPE_H */ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -2,6 +2,70 @@ if ATH79 +@@ -2,6 +2,79 @@ if ATH79 menu "Atheros AR71XX/AR724X/AR913X machine selection" @@ -213,6 +214,15 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + ++config ATH79_MACH_ALFA_AP120C ++ bool "ALFA Network AP120C board support" ++ select SOC_AR71XX ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_HORNET_UB + bool "ALFA Network Hornet-UB board support" + select SOC_AR933X @@ -272,7 +282,7 @@ config ATH79_MACH_AP121 bool "Atheros AP121 reference board" select SOC_AR933X -@@ -11,62 +75,1050 @@ config ATH79_MACH_AP121 +@@ -11,62 +84,1050 @@ config ATH79_MACH_AP121 select ATH79_DEV_M25P80 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -1351,7 +1361,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" -@@ -83,6 +1135,106 @@ config ATH79_MACH_UBNT_XM +@@ -83,6 +1144,106 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -1458,7 +1468,7 @@ endmenu config SOC_AR71XX -@@ -124,7 +1276,10 @@ config ATH79_DEV_DSA +@@ -124,7 +1285,10 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -1470,7 +1480,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -154,6 +1309,11 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -154,6 +1318,11 @@ config ATH79_PCI_ATH9K_FIXUP def_bool n config ATH79_ROUTERBOOT @@ -1484,11 +1494,12 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -38,9 +38,127 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,128 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # +obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o ++obj-$(CONFIG_ATH79_MACH_ALFA_AP120C) += mach-alfa-ap120c.o +obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o +obj-$(CONFIG_ATH79_MACH_ALL0258N) += mach-all0258n.o +obj-$(CONFIG_ATH79_MACH_ALL0315N) += mach-all0315n.o -- 2.11.0