ar71xx: Add Gainstrong MiniBox v1.0 support to trunk

This patch supersedes the v1 from September 17th.

Bumping the patch version - the MiniBox profile showed up under M, but
since it's called 'Gainstrong MiniBox v1.0' now it looks out of place.
Renamed the profile to gs-minibox-v1.mk to fix that.

The following patch adds support for the Gainstrong MiniBox into trunk
(or 'Designated Driver' :D ).

Fixed items:

- Inverted LED polarity (OOLITE seems to suffer from the same problem).
- Changed uppercase MINIBOX_V1_ prefix as requested.
- Prefixes are now gs_minibox_ similar to gs_oolite_ (same vendor).
- Mention the vendor (Gainstrong) in code headers.

Compiles fine, has been confirmed working by owners on 15.05.

Question: I've seen some boards use tools/firmware-utils/src/mktplinkfw.c,
the MiniBox images build fine without, so I'm wondering: do I need to add
it in there as well? Any added benefit?

Thank you

Signed-off by: Stijn Segers <francesco.borromini@inventati.org>

SVN-Revision: 47234
This commit is contained in:
John Crispin 2015-10-19 17:55:25 +00:00
parent 795cc23a08
commit 8d8a937272
9 changed files with 162 additions and 0 deletions

View file

@ -227,6 +227,9 @@ get_status_led() {
smart-300) smart-300)
status_led="nc-link:green:system" status_led="nc-link:green:system"
;; ;;
minibox-v1)
status_led="minibox-v1:green:system"
;;
oolite) oolite)
status_led="oolite:red:system" status_led="oolite:red:system"
;; ;;

View file

@ -433,6 +433,7 @@ dir-615-e4 |\
hiwifi-hc6361 |\ hiwifi-hc6361 |\
ja76pf |\ ja76pf |\
mc-mac1200r|\ mc-mac1200r|\
minibox-v1 |\
mynet-n600 |\ mynet-n600 |\
oolite |\ oolite |\
qihoo-c301 |\ qihoo-c301 |\

View file

@ -119,6 +119,9 @@ tplink_board_detect() {
"3C0001"*) "3C0001"*)
model="OOLITE" model="OOLITE"
;; ;;
"3C0002"*)
model="MINIBOX_V1"
;;
"070300"*) "070300"*)
model="TP-Link TL-WR703N" model="TP-Link TL-WR703N"
;; ;;
@ -520,6 +523,9 @@ ar71xx_board_detect() {
*"MAC1200R") *"MAC1200R")
name="mc-mac1200r" name="mc-mac1200r"
;; ;;
*"MiniBox V1.0")
name="minibox-v1"
;;
*MR12) *MR12)
name="mr12" name="mr12"
;; ;;

View file

@ -318,6 +318,7 @@ platform_check_image() {
el-mini | \ el-mini | \
gl-inet | \ gl-inet | \
mc-mac1200r | \ mc-mac1200r | \
minibox-v1 |\
onion-omega | \ onion-omega | \
oolite | \ oolite | \
smart-300 | \ smart-300 | \

View file

@ -75,6 +75,7 @@ CONFIG_ATH79_MACH_ESR900=y
CONFIG_ATH79_MACH_EW_DORIN=y CONFIG_ATH79_MACH_EW_DORIN=y
CONFIG_ATH79_MACH_F9K1115V2=y CONFIG_ATH79_MACH_F9K1115V2=y
CONFIG_ATH79_MACH_GL_INET=y CONFIG_ATH79_MACH_GL_INET=y
CONFIG_ATH79_MACH_GS_MINIBOX_V1=y
CONFIG_ATH79_MACH_GS_OOLITE=y CONFIG_ATH79_MACH_GS_OOLITE=y
CONFIG_ATH79_MACH_HIWIFI_HC6361=y CONFIG_ATH79_MACH_HIWIFI_HC6361=y
CONFIG_ATH79_MACH_HORNET_UB=y CONFIG_ATH79_MACH_HORNET_UB=y

View file

@ -0,0 +1,85 @@
/*
* 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);

View file

@ -0,0 +1,17 @@
#
# Copyright (C) 2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/MINIBOXV1
NAME:=Gainstrong MiniBox V1.0
PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
endef
define Profile/MINIBOXV1/Description
Package set optimized for the Gainstrong MiniBox V1.0
endef
$(eval $(call Profile,MINIBOXV1))

View file

@ -438,6 +438,15 @@ define Device/mc-mac1200r
endef endef
TARGET_DEVICES += mc-mac1200r TARGET_DEVICES += mc-mac1200r
define Device/minibox-v1
$(Device/tplink-16mlzma)
BOARDNAME := MINIBOX-V1
DEVICE_PROFILE := MINIBOXV1
TPLINK_HWID := 0x3C000201
CONSOLE := ttyATH0,115200
endef
TARGET_DEVICES += minibox-v1
define Device/onion-omega define Device/onion-omega
$(Device/tplink-16mlzma) $(Device/tplink-16mlzma)
BOARDNAME := ONION-OMEGA BOARDNAME := ONION-OMEGA

View file

@ -0,0 +1,39 @@
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
@@ -64,6 +64,7 @@ enum ath79_mach_type {
ATH79_MACH_EPG5000, /* EnGenius EPG5000 */
ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */
ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */
+ ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */
ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */
ATH79_MACH_HIWIFI_HC6361, /* HiWiFi HC6361 */
ATH79_MACH_JA76PF, /* jjPlus JA76PF */
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -511,6 +511,16 @@
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"
select SOC_AR933X
--- a/arch/mips/ath79/Makefile 2015-08-10 23:27:44.599500173 +0200
+++ b/arch/mips/ath79/Makefile 2015-08-10 23:29:25.090929262 +0200
@@ -75,6 +75,7 @@
obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o
obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o
obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.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
obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o