From d826424f9f2e24e51e97d1306cab1d2a6974894f Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Wed, 13 Sep 2017 17:58:42 -0400 Subject: [PATCH] Backport support for the GL-USB150 micro-router --- .../ar71xx/base-files/etc/board.d/01_leds | 1 + .../ar71xx/base-files/etc/board.d/02_network | 3 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.4 | 1 + .../files/arch/mips/ath79/Kconfig.openwrt | 9 ++ .../ar71xx/files/arch/mips/ath79/Makefile | 1 + .../files/arch/mips/ath79/mach-gl-usb150.c | 87 +++++++++++++++++++ .../ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/generic.mk | 19 ++-- 10 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-gl-usb150.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 7b0d961bce..f9ba7f65fa 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -283,6 +283,7 @@ dlan-pro-1200-ac) ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0" ;; gl-ar150|\ +gl-usb150|\ gl-ar300|\ gl-ar300m|\ gl-mifi) 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 f7ee11fb17..4c60585202 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -125,6 +125,9 @@ ar71xx_setup_interfaces() alfa-nx|\ dr344|\ gl-ar150|\ + gl-usb150) + ucidef_set_interface_lan "eth0" + ;; gl-ar300m|\ gl-domino|\ gl-inet|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index ae2dab9b58..f98e7d6850 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -623,6 +623,9 @@ ar71xx_board_detect() { *"GL AR150") name="gl-ar150" ;; + *"GL-USB150") + name="gl-usb150" + ;; *"GL AR300") name="gl-ar300" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 93ffb76d7b..8ec942c89e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -238,6 +238,7 @@ platform_check_image() { ew-dorin-router|\ ew-dorin|\ gl-ar150|\ + gl-usb150|\ gl-ar300m|\ gl-ar300|\ gl-domino|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index a8622454b4..879f9e130a 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -103,6 +103,7 @@ CONFIG_ATH79_MACH_ESR900=y CONFIG_ATH79_MACH_EW_DORIN=y CONFIG_ATH79_MACH_F9K1115V2=y CONFIG_ATH79_MACH_GL_AR150=y +CONFIG_ATH79_MACH_GL_USB150=y CONFIG_ATH79_MACH_GL_AR300=y CONFIG_ATH79_MACH_GL_AR300M=y CONFIG_ATH79_MACH_GL_DOMINO=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 58d7e43536..d74bce5a78 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -721,6 +721,15 @@ config ATH79_MACH_GL_INET select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_GL_USB150 + bool "GL.iNet GL-USB150 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_WMAC + config ATH79_MACH_EAP120 bool "TP-LINK EAP120 support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 7aee760195..3c2f62c65a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -106,6 +106,7 @@ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o obj-$(CONFIG_ATH79_MACH_ESR900) += mach-esr900.o obj-$(CONFIG_ATH79_MACH_EW_DORIN) += mach-ew-dorin.o obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o +obj-$(CONFIG_ATH79_MACH_GL_USB150) += mach-gl-usb150.o obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o obj-$(CONFIG_ATH79_MACH_GL_AR300) += mach-gl-ar300.o obj-$(CONFIG_ATH79_MACH_GL_AR300M) += mach-gl-ar300m.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-usb150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-usb150.c new file mode 100644 index 0000000000..6cc27e1ada --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-usb150.c @@ -0,0 +1,87 @@ +/* + * GL.iNet GL-USB150 board support + * + * Copyright (C) 2017 Piotr Dymacz + * + * 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 "common.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define GL_USB150_GPIO_LED_POWER 13 +#define GL_USB150_GPIO_LED_WLAN 0 +#define GL_USB150_GPIO_LAN_RESET 7 +#define GL_USB150_GPIO_BTN_RESET 11 + +#define GL_USB150_KEYS_POLL_INTERVAL 20 +#define GL_USB150_KEYS_DEBOUNCE_INTERVAL \ + (3 * GL_USB150_KEYS_POLL_INTERVAL) + +#define GL_USB150_WMAC_CALDATA_OFFSET 0x1000 + +static struct gpio_led gl_usb150_leds_gpio[] __initdata = { + { + .name = "gl-usb150:green:power", + .gpio = GL_USB150_GPIO_LED_POWER, + .active_low = 0, + }, { + .name = "gl-usb150:green:wlan", + .gpio = GL_USB150_GPIO_LED_WLAN, + .active_low = 0, + }, +}; + +static struct gpio_keys_button gl_usb150_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = GL_USB150_KEYS_DEBOUNCE_INTERVAL, + .gpio = GL_USB150_GPIO_BTN_RESET, + .active_low = 0, + }, +}; + +static void __init gl_usb150_setup(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + ath79_register_m25p80(NULL); + + ath79_setup_ar933x_phy4_switch(false, false); + + /* LAN (PHY4 connected with Realtek RTL8152B) */ + ath79_init_mac(ath79_eth0_data.mac_addr, art, 0); + ath79_register_mdio(0, 0x0); + ath79_register_eth(0); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_usb150_leds_gpio), + gl_usb150_leds_gpio); + + ath79_register_gpio_keys_polled(-1, GL_USB150_KEYS_POLL_INTERVAL, + ARRAY_SIZE(gl_usb150_gpio_keys), + gl_usb150_gpio_keys); + + gpio_request_one(GL_USB150_GPIO_LAN_RESET, + GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED, + "LAN reset"); + + ath79_register_wmac(art + GL_USB150_WMAC_CALDATA_OFFSET, NULL); +} + +MIPS_MACHINE(ATH79_MACH_GL_USB150, "GL-USB150", "GL.iNet GL-USB150", + gl_usb150_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index a12685cd11..540aeaf3da 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -103,6 +103,7 @@ enum ath79_mach_type { ATH79_MACH_GL_DOMINO, /* Domino */ ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ ATH79_MACH_GL_MIFI, /* GL-MIFI support */ + ATH79_MACH_GL_USB150, /* GL.iNet GL-USB150 */ 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 8920ed05ac..ec6aeecd72 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -121,15 +121,18 @@ define Device/weio endef TARGET_DEVICES += weio -define Device/gl-ar150 - DEVICE_TITLE := GL AR150 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME = GL-AR150 - IMAGE_SIZE = 16000k - CONSOLE = ttyATH0,115200 - MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro +define Device/gl-usb150 + DEVICE_TITLE := GL.iNet GL-USB150 + DEVICE_PACKAGES := -swconfig + BOARDNAME := GL-USB150 + IMAGE_SIZE := 16000k + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro + SUPPORTED_DEVICES := gl-usb150 + IMAGE/sysupgrade.bin = append-kernel | pad-to $$$$(BLOCKSIZE) | \ + append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef -TARGET_DEVICES += gl-ar150 +TARGET_DEVICES += gl-usb150 define Device/tpe-r1100 $(Device/gl-ar150) -- 2.25.1