Backport support for the GL-USB150 micro-router

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)

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|\

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"
 		;;

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|\

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

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

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

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 <pepe2k@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/gpio.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
+
+#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);

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 */

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)