ar71xx: rework GainStrong devices support

- combine support for Oolite/MiniBox V1.0 in single mach-*.c file
- fix model/board names
- include correct/full vendor name
- drop redundant package and factory image

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

6 files changed, 148 insertions, 204 deletions

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 50cc00dca9..ed2d42e7f1 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -880,18 +880,8 @@ config ATH79_MACH_EAP300V2
 	select ATH79_DEV_M25P80
 	select ATH79_DEV_WMAC
 
-config ATH79_MACH_GS_MINIBOX_V1
-	bool "Gainstrong MiniBox V1.0 support"
-	select SOC_AR933X
-	select ARH79_DEV_ETH
-	select ARH79_DEV_GPIO_BUTTONS
-	select ATH79_DEV_LEDS_GPIO
-	select ATH79_DEV_M25P80
-	select ATH79_DEV_USB
-	select ATH79_DEV_WMAC
-
-config ATH79_MACH_GS_OOLITE
-	bool "GS Oolite V1 support"
+config ATH79_MACH_GS_OOLITE_V1
+	bool "GainStrong Oolite/Minibox V1.0 support"
 	select SOC_AR933X
 	select ARH79_DEV_ETH
 	select ARH79_DEV_GPIO_BUTTONS
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 2e63f25399..54f4053b41 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -131,8 +131,7 @@ 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_GL_USB150)		+= mach-gl-usb150.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_GS_OOLITE_V1)		+= mach-gs-oolite-v1.o
 obj-$(CONFIG_ATH79_MACH_HIVEAP_121)		+= mach-hiveap-121.o
 obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361)		+= mach-hiwifi-hc6361.o
 obj-$(CONFIG_ATH79_MACH_HORNET_UB)		+= mach-hornet-ub.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c
deleted file mode 100644
index 47eeb65de8..0000000000
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-minibox-v1.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Gainstrong MiniBox V1.0 board support
- *
- *
- *  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 <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-usb.h"
-#include "dev-wmac.h"
-#include "machtypes.h"
-
-#define GS_MINIBOX_V1_GPIO_BTN_RESET	11
-
-#define GS_MINIBOX_V1_GPIO_LED_SYSTEM	1
-
-#define GS_MINIBOX_V1_KEYS_POLL_INTERVAL	20	/* msecs */
-#define GS_MINIBOX_V1_KEYS_DEBOUNCE_INTERVAL (3 * GS_MINIBOX_V1_KEYS_POLL_INTERVAL)
-
-static const char *gs_minibox_v1_part_probes[] = {
-	"tp-link",
-	NULL,
-};
-
-static struct flash_platform_data gs_minibox_v1_flash_data = {
-	.part_probes	= gs_minibox_v1_part_probes,
-};
-
-static struct gpio_led gs_minibox_v1_leds_gpio[] __initdata = {
-	{
-		.name		= "minibox-v1:green:system",
-		.gpio		= GS_MINIBOX_V1_GPIO_LED_SYSTEM,
-		.active_low	= 1,
-	},
-};
-
-static struct gpio_keys_button gs_minibox_v1_gpio_keys[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= KEY_RESTART,
-		.debounce_interval = GS_MINIBOX_V1_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= GS_MINIBOX_V1_GPIO_BTN_RESET,
-		.active_low	= 0,
-	},
-};
-
-static void __init gs_minibox_v1_setup(void)
-{
-	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
-	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-	ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_minibox_v1_leds_gpio),
-				 gs_minibox_v1_leds_gpio);
-
-	ath79_register_gpio_keys_polled(-1, GS_MINIBOX_V1_KEYS_POLL_INTERVAL,
-					ARRAY_SIZE(gs_minibox_v1_gpio_keys),
-					gs_minibox_v1_gpio_keys);
-
-	ath79_register_usb();
-
-	ath79_register_m25p80(&gs_minibox_v1_flash_data);
-	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
-
-	ath79_register_mdio(0, 0x0);
-	ath79_register_eth(1);
-	ath79_register_eth(0);
-
-	ath79_register_wmac(ee, mac);
-}
-
-MIPS_MACHINE(ATH79_MACH_GS_MINIBOX_V1, "MINIBOX-V1",
-	     "MiniBox V1.0", gs_minibox_v1_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c
new file mode 100644
index 0000000000..d424e0f111
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite-v1.c
@@ -0,0 +1,143 @@
+/*
+ *  GainStrong Oolite/MiniBox V1.0 boards support
+ *
+ *
+ *  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 <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"
+#include "dev-usb.h"
+
+#define GS_MINIBOX_V1_GPIO_BTN_RESET	11
+#define GS_MINIBOX_V1_GPIO_LED_SYSTEM	1
+
+#define GS_OOLITE_V1_GPIO_BTN6		6
+#define GS_OOLITE_V1_GPIO_BTN7		7
+#define GS_OOLITE_V1_GPIO_BTN_RESET	11
+#define GS_OOLITE_V1_GPIO_LED_SYSTEM	27
+
+#define GS_KEYS_POLL_INTERVAL		20 /* msecs */
+#define GS_KEYS_DEBOUNCE_INTERVAL	(3 * GS_KEYS_POLL_INTERVAL)
+
+static const char *gs_part_probes[] = {
+	"tp-link",
+	NULL,
+};
+
+static struct flash_platform_data gs_flash_data = {
+	.part_probes	= gs_part_probes,
+};
+
+static struct gpio_led gs_minibox_v1_leds_gpio[] __initdata = {
+	{
+		.name		= "minibox-v1:green:system",
+		.gpio		= GS_MINIBOX_V1_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_led gs_oolite_v1_leds_gpio[] __initdata = {
+	{
+		.name		= "oolite-v1:red:system",
+		.gpio		= GS_OOLITE_V1_GPIO_LED_SYSTEM,
+		.active_low	= 1,
+	},
+};
+
+static struct gpio_keys_button gs_minibox_v1_gpio_keys[] __initdata = {
+	{
+		.desc			= "reset",
+		.type			= EV_KEY,
+		.code			= KEY_RESTART,
+		.debounce_interval	= GS_KEYS_DEBOUNCE_INTERVAL,
+		.gpio			= GS_MINIBOX_V1_GPIO_BTN_RESET,
+		.active_low		= 0,
+	},
+};
+
+static struct gpio_keys_button gs_oolite_v1_gpio_keys[] __initdata = {
+	{
+		.desc			= "reset",
+		.type			= EV_KEY,
+		.code			= KEY_RESTART,
+		.debounce_interval	= GS_KEYS_DEBOUNCE_INTERVAL,
+		.gpio			= GS_OOLITE_V1_GPIO_BTN_RESET,
+		.active_low		= 0,
+	}, {
+		.desc			= "BTN_6",
+		.type			= EV_KEY,
+		.code			= BTN_6,
+		.debounce_interval	= GS_KEYS_DEBOUNCE_INTERVAL,
+		.gpio			= GS_OOLITE_V1_GPIO_BTN6,
+		.active_low		= 0,
+	}, {
+		.desc			= "BTN_7",
+		.type			= EV_KEY,
+		.code			= BTN_7,
+		.debounce_interval	= GS_KEYS_DEBOUNCE_INTERVAL,
+		.gpio			= GS_OOLITE_V1_GPIO_BTN7,
+		.active_low		= 0,
+	},
+};
+
+static void __init gs_common_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+
+	ath79_register_usb();
+
+	ath79_register_m25p80(&gs_flash_data);
+
+	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
+	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
+
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(1);
+	ath79_register_eth(0);
+
+	ath79_register_wmac(art, mac);
+}
+
+static void __init gs_minibox_v1_setup(void)
+{
+	gs_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_minibox_v1_leds_gpio),
+				 gs_minibox_v1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, GS_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(gs_minibox_v1_gpio_keys),
+					gs_minibox_v1_gpio_keys);
+}
+
+static void __init gs_oolite_v1_setup(void)
+{
+	gs_common_setup();
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_oolite_v1_leds_gpio),
+				 gs_oolite_v1_leds_gpio);
+
+	ath79_register_gpio_keys_polled(-1, GS_KEYS_POLL_INTERVAL,
+					ARRAY_SIZE(gs_oolite_v1_gpio_keys),
+					gs_oolite_v1_gpio_keys);
+}
+
+MIPS_MACHINE(ATH79_MACH_GS_MINIBOX_V1, "MINIBOX-V1", "GainStrong MiniBox V1.0",
+	     gs_minibox_v1_setup);
+
+MIPS_MACHINE(ATH79_MACH_GS_OOLITE_V1, "OOLITE-V1", "GainStrong Oolite V1.0",
+	     gs_oolite_v1_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
deleted file mode 100644
index c6cb61c366..0000000000
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gs-oolite.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  Oolite board support
- *
- *
- *  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 <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"
-#include "dev-usb.h"
-
-#define GS_OOLITE_GPIO_BTN6		6
-#define GS_OOLITE_GPIO_BTN7		7
-#define GS_OOLITE_GPIO_BTN_RESET	11
-
-#define GS_OOLITE_GPIO_LED_SYSTEM	27
-
-#define GS_OOLITE_KEYS_POLL_INTERVAL	20	/* msecs */
-#define GS_OOLITE_KEYS_DEBOUNCE_INTERVAL (3 * GS_OOLITE_KEYS_POLL_INTERVAL)
-
-static const char *gs_oolite_part_probes[] = {
-	"tp-link",
-	NULL,
-};
-
-static struct flash_platform_data gs_oolite_flash_data = {
-	.part_probes	= gs_oolite_part_probes,
-};
-
-static struct gpio_led gs_oolite_leds_gpio[] __initdata = {
-	{
-		.name		= "oolite:red:system",
-		.gpio		= GS_OOLITE_GPIO_LED_SYSTEM,
-		.active_low	= 1,
-	},
-};
-
-static struct gpio_keys_button gs_oolite_gpio_keys[] __initdata = {
-	{
-		.desc		= "reset",
-		.type		= EV_KEY,
-		.code		= KEY_RESTART,
-		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= GS_OOLITE_GPIO_BTN_RESET,
-		.active_low	= 0,
-	},
-	{
-		.desc		= "BTN_6",
-		.type		= EV_KEY,
-		.code		= BTN_6,
-		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= GS_OOLITE_GPIO_BTN6,
-		.active_low	= 0,
-	},
-	{
-		.desc		= "BTN_7",
-		.type		= EV_KEY,
-		.code		= BTN_7,
-		.debounce_interval = GS_OOLITE_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= GS_OOLITE_GPIO_BTN7,
-		.active_low	= 0,
-	},
-};
-
-static void __init gs_oolite_setup(void)
-{
-	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
-	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-	ath79_register_leds_gpio(-1, ARRAY_SIZE(gs_oolite_leds_gpio),
-				 gs_oolite_leds_gpio);
-
-	ath79_register_gpio_keys_polled(-1, GS_OOLITE_KEYS_POLL_INTERVAL,
-					ARRAY_SIZE(gs_oolite_gpio_keys),
-					gs_oolite_gpio_keys);
-
-	ath79_register_usb();
-
-	ath79_register_m25p80(&gs_oolite_flash_data);
-	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-	ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
-
-	ath79_register_mdio(0, 0x0);
-	ath79_register_eth(1);
-	ath79_register_eth(0);
-
-	ath79_register_wmac(ee, mac);
-}
-
-MIPS_MACHINE(ATH79_MACH_GS_OOLITE, "GS-OOLITE",
-	     "Oolite V1.0", gs_oolite_setup);
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 03020f889e..b3250053a6 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -126,8 +126,8 @@ enum ath79_mach_type {
 	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_GS_MINIBOX_V1,		/* GainStrong MiniBox V1.0 */
+	ATH79_MACH_GS_OOLITE_V1,		/* GainStrong Oolite V1.0 */
 	ATH79_MACH_HIVEAP_121,			/* Aerohive HiveAP-121*/
 	ATH79_MACH_HIWIFI_HC6361,		/* HiWiFi HC6361 */
 	ATH79_MACH_HORNET_UB,			/* ALFA Networks Hornet-UB */