From 42305ae24aa7ce95824d3b2303a40ab211f1a766 Mon Sep 17 00:00:00 2001 From: Zhao Gang Date: Tue, 19 Jul 2016 02:54:11 +0000 Subject: [PATCH 1/1] ar71xx: add support for gl-mifi This add initial support for gl-mifi. Product page: http://www.gl-inet.com/mifi/ Signed-off-by: Zhao Gang --- .../ar71xx/base-files/etc/board.d/01_leds | 7 ++ .../ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.4 | 1 + .../files/arch/mips/ath79/Kconfig.openwrt | 10 ++ .../ar71xx/files/arch/mips/ath79/Makefile | 1 + .../files/arch/mips/ath79/mach-gl-mifi.c | 114 ++++++++++++++++++ .../ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/generic.mk | 10 ++ 10 files changed, 148 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c 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 1254c711f4..a77147eeca 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -275,6 +275,13 @@ gl-inet) ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red:wlan" "phy0tpt" ;; +gl-mifi) + ucidef_set_led_netdev "wan" "WAN" "gl_mifi:wan" "eth0" + ucidef_set_led_netdev "lan" "LAN" "gl_mifi:lan" "eth1" + ucidef_set_led_netdev "3gnet" "3GNET" "gl_mifi:net" "3g-wan" + ucidef_set_led_wlan "wlan" "WLAN" "gl_mifi:wlan" "phy0tpt" + ;; + esr900) ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "engenius:blue:wlan-2g" "phy0tpt" ucidef_set_led_wlan "wlan5g" "WLAN 5 GHz" "engenius:blue:wlan-5g" "phy1tpt" 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 7c4958a71f..11e78a687c 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -394,6 +394,7 @@ gl-ar150 |\ gl-ar300m |\ gl-domino |\ gl-inet |\ +gl-mifi |\ jwap003 |\ pb42 |\ pb44 |\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index d1c92c97d2..68ad3c2058 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -538,6 +538,8 @@ ar71xx_board_detect() { ;; *"GL-AR300M") name="gl-ar300m" + *"GL-MIFI") + name="gl-mifi" ;; *"EnGenius EPG5000") name="epg5000" diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index c5cb4aba35..c02e5e775e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -232,6 +232,7 @@ platform_check_image() { ew-dorin | \ ew-dorin-router | \ gl-ar150 | \ + gl-mifi | \ gl-ar300 | \ gl-ar300m | \ gl-domino | \ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 1cae660b1a..5878b7a52b 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -92,6 +92,7 @@ CONFIG_ATH79_MACH_GL_AR300=y CONFIG_ATH79_MACH_GL_AR300M=y CONFIG_ATH79_MACH_GL_DOMINO=y CONFIG_ATH79_MACH_GL_INET=y +CONFIG_ATH79_MACH_GL_MIFI=y CONFIG_ATH79_MACH_GS_MINIBOX_V1=y CONFIG_ATH79_MACH_GS_OOLITE=y CONFIG_ATH79_MACH_HIWIFI_HC6361=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index a5c673cd2c..a0ceecbb14 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -624,6 +624,16 @@ config ATH79_MACH_GL_DOMINO select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_GL_MIFI + bool "GL MIFI support" + select SOC_AR933X + 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_GL_INET bool "GL-INET support" select SOC_AR933X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index a49384a7e1..ff4fe9f27b 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -96,6 +96,7 @@ obj-$(CONFIG_ATH79_MACH_GL_AR300) += mach-gl-ar300.o obj-$(CONFIG_ATH79_MACH_GL_AR300M) += mach-gl-ar300m.o obj-$(CONFIG_ATH79_MACH_GL_DOMINO) += mach-gl-domino.o obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o +obj-$(CONFIG_ATH79_MACH_GL_MIFI) += mach-gl-mifi.o obj-$(CONFIG_ATH79_MACH_GS_MINIBOX_V1) += mach-gs-minibox-v1.o obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361) += mach-hiwifi-hc6361.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c new file mode 100644 index 0000000000..567fef9c9c --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c @@ -0,0 +1,114 @@ +/* + * Mifi board support + * + * Copyright (C) 2011 dongyuqi <729650915@qq.com> + * Copyright (C) 2011-2012 Gabor Juhos + * Copyright (C) 2013 alzhao + * Copyright (C) 2014 Michel Stempin + * + * 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 "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define GL_MIFI_GPIO_LED_WAN 27 +#define GL_MIFI_GPIO_LED_LAN 16 +#define GL_MIFI_GPIO_LED_WLAN 1 +#define GL_MIFI_GPIO_LED_NET 0 +#define GL_MIFI_GPIO_LED_3GCONTROL 7 + +#define GL_MIFI_GPIO_BTN_RESET 11 + +#define GL_MIFI_KEYS_POLL_INTERVAL 20 /* msecs */ +#define GL_MIFI_KEYS_DEBOUNCE_INTERVAL (3 * GL_MIFI_KEYS_POLL_INTERVAL) + +#define GL_MIFI_MAC0_OFFSET 0x0000 +#define GL_MIFI_MAC1_OFFSET 0x0000 +#define GL_MIFI_CALDATA_OFFSET 0x1000 +#define GL_MIFI_WMAC_MAC_OFFSET 0x0000 + +static struct gpio_led gl_mifi_leds_gpio[] __initdata = { + { + .name = "gl_mifi:wan", + .gpio = GL_MIFI_GPIO_LED_WAN, + .active_low = 0, + }, + { + .name = "gl_mifi:lan", + .gpio = GL_MIFI_GPIO_LED_LAN, + .active_low = 0, + }, + { + .name = "gl_mifi:wlan", + .gpio = GL_MIFI_GPIO_LED_WLAN, + .active_low = 0, + }, + { + .name = "gl_mifi:net", + .gpio = GL_MIFI_GPIO_LED_NET, + .active_low = 0, + }, + { + .name = "gl_mifi:3gcontrol", + .gpio = GL_MIFI_GPIO_LED_3GCONTROL, + .active_low = 0, + } +}; + +static struct gpio_keys_button gl_mifi_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = GL_MIFI_KEYS_DEBOUNCE_INTERVAL, + .gpio = GL_MIFI_GPIO_BTN_RESET, + .active_low = 0, + }, +}; + +static void __init gl_mifi_setup(void) +{ + + /* ART base address */ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ + ath79_setup_ar933x_phy4_switch(false, false); + + /* register flash. */ + ath79_register_m25p80(NULL); + + /* register gpio LEDs and keys */ + ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_mifi_leds_gpio), + gl_mifi_leds_gpio); + ath79_register_gpio_keys_polled(-1, GL_MIFI_KEYS_POLL_INTERVAL, + ARRAY_SIZE(gl_mifi_gpio_keys), + gl_mifi_gpio_keys); + + /* enable usb */ + ath79_register_usb(); + + /* register eth0 as WAN, eth1 as LAN */ + ath79_init_mac(ath79_eth0_data.mac_addr, art+GL_MIFI_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, art+GL_MIFI_MAC1_OFFSET, 0); + ath79_register_mdio(0, 0x0); + ath79_register_eth(0); + ath79_register_eth(1); + + /* register wireless mac with cal data */ + ath79_register_wmac(art + GL_MIFI_CALDATA_OFFSET, art + GL_MIFI_WMAC_MAC_OFFSET); +} + +MIPS_MACHINE(ATH79_MACH_GL_MIFI, "GL-MIFI", "GL-MIFI",gl_mifi_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 3e52ee4122..3051a2572b 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -89,6 +89,7 @@ enum ath79_mach_type { ATH79_MACH_GL_AR300M, /* GL-AR300M */ ATH79_MACH_GL_DOMINO, /* Domino */ ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ + ATH79_MACH_GL_MIFI, /* GL-MIFI support */ ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */ ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */ ATH79_MACH_HIWIFI_HC6361, /* HiWiFi HC6361 */ diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index cb57dba986..6e5ef2b68b 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -77,6 +77,16 @@ define Device/gl-domino endef TARGET_DEVICES += gl-domino +define Device/gl-mifi + DEVICE_TITLE := GL MIFI + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 + BOARDNAME = GL-MIFI + IMAGE_SIZE = 16000k + CONSOLE = ttyATH0,115200 + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro +endef +TARGET_DEVICES += gl-mifi + define Device/dr531 DEVICE_TITLE := Wallys DR531 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 -- 2.30.2