KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: Fix LED definitions for the DRAGINO2 board

Browse source 
This patch fixes LED definitions for the DRAGINO2 board.

1. It renames the Router/USB led to System, as it is now marked "SYS" on the board.
2. It gives control of the LAN and WAN leds and some other GPIOs to Linux.
3. It fixes the active_low property for the LAN and WAN leds.
4. It sets up WLAN, LAN and WAN leds in the UCI defaults.
5. It allows usage of the System led by the diag.sh script, so it will be used to indicate boot and failsafe status.

Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>

SVN-Revision: 42897
This commit is contained in:
John Crispin 2014-10-14 10:33:07 +00:00
parent 28d57f707d
commit 99c238ff15
3 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
target/linux/ar71xx/base-files/etc/diag.sh
View file

@ -62,6 +62,9 @@ get_status_led() {
dir-835-a1) dir-835-a1)
status_led="d-link:amber:power" status_led="d-link:amber:power"
;; ;;
dragino2)
status_led="dragino2:red:system"
;;
eap300v2) eap300v2)
status_led="engenius:blue:power" status_led="engenius:blue:power"
;; ;;

6
target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
View file

@ -66,6 +66,12 @@ db120)
ucidef_set_led_usbdev "usb" "USB" "db120:green:usb" "1-1" ucidef_set_led_usbdev "usb" "USB" "db120:green:usb" "1-1"
;; ;;
dragino2)
ucidef_set_led_wlan "wlan" "WLAN" "dragino2:red:wlan" "phy0tpt"
ucidef_set_led_netdev "lan" "LAN" "dragino2:red:lan" "eth0"
ucidef_set_led_netdev "wan" "WAN" "dragino2:red:wan" "eth1"
;;
eap300v2) eap300v2)
ucidef_set_led_netdev "lan" "LAN" "engenius:blue:lan" "eth0" ucidef_set_led_netdev "lan" "LAN" "engenius:blue:lan" "eth0"
ucidef_set_led_wlan "wlan" "WLAN" "engenius:blue:wlan" "phy0tpt" ucidef_set_led_wlan "wlan" "WLAN" "engenius:blue:wlan" "phy0tpt"

43
target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
View file

@ -3,6 +3,7 @@
* *
* Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org> * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2012 Elektra Wagenrad <elektra@villagetelco.org> * Copyright (C) 2012 Elektra Wagenrad <elektra@villagetelco.org>
* Copyright (C) 2014 Vittorio Gambaletta <openwrt@vittgam.net>
* *
* This program is free software; you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 2 as published
@ -27,12 +28,12 @@
#define DRAGINO2_GPIO_LED_WAN 17 #define DRAGINO2_GPIO_LED_WAN 17
/* /*
* The following GPIO is actually named "Router" on the board. * The following GPIO is named "SYS" on newer revisions of the the board.
* However, since the "Router" feature is not supported as of yet * It was previously used to indicate USB activity, even though it was
* we use it to display USB activity. * named "Router".
*/ */
#define DRAGINO2_GPIO_LED_USB 28 #define DRAGINO2_GPIO_LED_SYS 28
#define DRAGINO2_GPIO_BTN_JUMPSTART 11 #define DRAGINO2_GPIO_BTN_JUMPSTART 11
#define DRAGINO2_GPIO_BTN_RESET 12 #define DRAGINO2_GPIO_BTN_RESET 12
@ -45,24 +46,24 @@
#define DRAGINO2_WMAC_MAC_OFFSET 0x1002 #define DRAGINO2_WMAC_MAC_OFFSET 0x1002
static struct gpio_led dragino2_leds_gpio[] __initdata = { static struct gpio_led dragino2_leds_gpio[] __initdata = {
{
.name = "dragino2:red:lan",
.gpio = DRAGINO2_GPIO_LED_LAN,
.active_low = 0,
},
{ {
.name = "dragino2:red:wlan", .name = "dragino2:red:wlan",
.gpio = DRAGINO2_GPIO_LED_WLAN, .gpio = DRAGINO2_GPIO_LED_WLAN,
.active_low = 0, .active_low = 0,
}, },
{ {
.name = "dragino2:red:wan", .name = "dragino2:red:wan",
.gpio = DRAGINO2_GPIO_LED_WAN, .gpio = DRAGINO2_GPIO_LED_WAN,
.active_low = 0, .active_low = 1,
}, },
{ {
.name = "dragino2:red:usb", .name = "dragino2:red:lan",
.gpio = DRAGINO2_GPIO_LED_USB, .gpio = DRAGINO2_GPIO_LED_LAN,
.active_low = 1,
},
{
.name = "dragino2:red:system",
.gpio = DRAGINO2_GPIO_LED_SYS,
.active_low = 0, .active_low = 0,
}, },
}; };
@ -99,15 +100,23 @@ static void __init dragino2_common_setup(void)
ath79_register_mdio(0, 0x0); ath79_register_mdio(0, 0x0);
/* Enable GPIO15 and GPIO16 and possibly GPIO26 and GPIO27 */ /* Enable GPIO13, GPIO14, GPIO15, GPIO16 and GPIO17 */
ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN | ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN); AR933X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
AR933X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
/* LAN ports */ /* LAN port */
ath79_register_eth(1); ath79_register_eth(1);
/* WAN port */ /* WAN port */
ath79_register_eth(0); ath79_register_eth(0);
/* Enable GPIO26 and GPIO27 */
ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP,
ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP) |
AR933X_BOOTSTRAP_MDIO_GPIO_EN);
} }
static void __init dragino2_setup(void) static void __init dragino2_setup(void)