mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: WNR2200: enable control of all LEDs and buttons

Browse Source 
This patch provides full GPIO support for WNR2200 (LEDs and buttons).
It exposes all LEDs to operating system, including Ethernet ones.

Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>

SVN-Revision: 49101
This commit is contained in:
John Crispin 2016-04-01 07:11:34 +00:00
parent 3da1ef38c1
commit ba2d1ccffa
2 changed files with 124 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/ar71xx/base-files/etc/board.d/01_leds
View File

@ -711,6 +711,21 @@ wnr2000-v4)
ucidef_set_led_usbdev "usb" "USB" "netgear:amber:status" "1-1" ucidef_set_led_usbdev "usb" "USB" "netgear:amber:status" "1-1"
;; ;;
wnr2200)
ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0"
ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0"
ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04"
ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" "0x04"
ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" "0x04"
ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" "0x04"
ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" "0x02"
ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" "0x02"
ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" "0x02"
ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" "0x02"
ucidef_set_led_usbdev "usb" "USB" "netgear:green:usb" "1-1"
;;
wnr612-v2) wnr612-v2)
ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0" ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0"
ucidef_set_led_netdev "wlan" "WLAN" "netgear:green:wlan" "wlan0" ucidef_set_led_netdev "wlan" "WLAN" "netgear:green:wlan" "wlan0"

145
target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
View File

@ -15,6 +15,8 @@
#include <linux/kernel.h> /* for max() macro */ #include <linux/kernel.h> /* for max() macro */
#include <asm/mach-ath79/ath79.h> #include <asm/mach-ath79/ath79.h>
#include <asm/mach-ath79/ar71xx_regs.h> /* needed to disable switch LEDs */
#include "common.h" /* needed to disable switch LEDs */
#include "dev-ap9x-pci.h" #include "dev-ap9x-pci.h"
#include "dev-eth.h" #include "dev-eth.h"
@ -24,21 +26,28 @@
#include "dev-usb.h" #include "dev-usb.h"
#include "machtypes.h" #include "machtypes.h"
/* WNR2200 - connected through AR7241 */
#define WNR2200_GPIO_LED_LAN2_AMBER 0 #define WNR2200_GPIO_LED_LAN2_AMBER 0
#define WNR2200_GPIO_LED_LAN4_AMBER 1 #define WNR2200_GPIO_LED_LAN4_AMBER 1
#define WNR2200_GPIO_LED_WPS 5 #define WNR2200_GPIO_LED_LAN1_AMBER 6 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
#define WNR2200_GPIO_LED_WAN_GREEN 7 #define WNR2200_GPIO_LED_WPS_GREEN 7 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
#define WNR2200_GPIO_LED_USB 8 #define WNR2200_GPIO_LED_USB_GREEN 8 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
#define WNR2200_GPIO_LED_LAN3_AMBER 11 #define WNR2200_GPIO_LED_LAN3_AMBER 11
#define WNR2200_GPIO_LED_WAN_AMBER 12 #define WNR2200_GPIO_LED_WAN_AMBER 12
#define WNR2200_GPIO_LED_LAN1_GREEN 13 #define WNR2200_GPIO_LED_LAN1_GREEN 13 /* AR724X_..._ETH_SWITCH_LED0 */
#define WNR2200_GPIO_LED_LAN2_GREEN 14 #define WNR2200_GPIO_LED_LAN2_GREEN 14 /* AR724X_..._ETH_SWITCH_LED1 */
#define WNR2200_GPIO_LED_LAN3_GREEN 15 #define WNR2200_GPIO_LED_LAN3_GREEN 15 /* AR724X_..._ETH_SWITCH_LED2 */
#define WNR2200_GPIO_LED_LAN4_GREEN 16 #define WNR2200_GPIO_LED_LAN4_GREEN 16 /* AR724X_..._ETH_SWITCH_LED3 */
#define WNR2200_GPIO_LED_PWR_AMBER 21 #define WNR2200_GPIO_LED_WAN_GREEN 17 /* AR724X_..._ETH_SWITCH_LED4 */
#define WNR2200_GPIO_LED_PWR_GREEN 22
#define WNR2200_GPIO_USB_5V 4 /* WNR2200 - connected through AR9287 */
#define WNR2200_GPIO_USB_POWER 24 #define WNR2200_GPIO_WMAC_LED_WLAN_BLUE 0
#define WNR2200_GPIO_WMAC_LED_TEST_AMBER 1
#define WNR2200_GPIO_WMAC_LED_POWER_GREEN 2
#define WNR2200_GPIO_WMAC_BTN_RFKILL 3
#define WNR2200_GPIO_WMAC_USB_5V 4
#define WNR2200_GPIO_WMAC_BTN_WPS 5
#define WNR2200_GPIO_WMAC_BTN_RESET 6
#define WNR2200_KEYS_POLL_INTERVAL 20 /* msecs */ #define WNR2200_KEYS_POLL_INTERVAL 20 /* msecs */
#define WNR2200_KEYS_DEBOUNCE_INTERVAL (3 * WNR2200_KEYS_POLL_INTERVAL) #define WNR2200_KEYS_DEBOUNCE_INTERVAL (3 * WNR2200_KEYS_POLL_INTERVAL)
@ -50,29 +59,21 @@
static struct gpio_led wnr2200_leds_gpio[] __initdata = { static struct gpio_led wnr2200_leds_gpio[] __initdata = {
{ {
.name = "netgear:amber:lan1",
.gpio = WNR2200_GPIO_LED_LAN1_AMBER,
.active_low = 1,
}, {
.name = "netgear:amber:lan2", .name = "netgear:amber:lan2",
.gpio = WNR2200_GPIO_LED_LAN2_AMBER, .gpio = WNR2200_GPIO_LED_LAN2_AMBER,
.active_low = 1, .active_low = 1,
}, {
.name = "netgear:amber:lan4",
.gpio = WNR2200_GPIO_LED_LAN4_AMBER,
.active_low = 1,
}, {
.name = "netgear:green:wps",
.gpio = WNR2200_GPIO_LED_WPS,
.active_low = 1,
}, {
.name = "netgear:green:wan",
.gpio = WNR2200_GPIO_LED_WAN_GREEN,
.active_low = 1,
}, {
.name = "netgear:green:usb",
.gpio = WNR2200_GPIO_LED_USB,
.active_low = 1,
}, { }, {
.name = "netgear:amber:lan3", .name = "netgear:amber:lan3",
.gpio = WNR2200_GPIO_LED_LAN3_AMBER, .gpio = WNR2200_GPIO_LED_LAN3_AMBER,
.active_low = 1, .active_low = 1,
}, {
.name = "netgear:amber:lan4",
.gpio = WNR2200_GPIO_LED_LAN4_AMBER,
.active_low = 1,
}, { }, {
.name = "netgear:amber:wan", .name = "netgear:amber:wan",
.gpio = WNR2200_GPIO_LED_WAN_AMBER, .gpio = WNR2200_GPIO_LED_WAN_AMBER,
@ -94,12 +95,56 @@ static struct gpio_led wnr2200_leds_gpio[] __initdata = {
.gpio = WNR2200_GPIO_LED_LAN4_GREEN, .gpio = WNR2200_GPIO_LED_LAN4_GREEN,
.active_low = 1, .active_low = 1,
}, { }, {
.name = "netgear:amber:power", .name = "netgear:green:usb",
.gpio = WNR2200_GPIO_LED_PWR_AMBER, .gpio = WNR2200_GPIO_LED_USB_GREEN,
.active_low = 1,
}, {
.name = "netgear:green:wan",
.gpio = WNR2200_GPIO_LED_WAN_GREEN,
.active_low = 1,
}, {
.name = "netgear:green:wps",
.gpio = WNR2200_GPIO_LED_WPS_GREEN,
.active_low = 1,
}
};
static const char *wnr2200_wmac_led_name = "netgear:blue:wlan";
static struct gpio_led wnr2200_wmac_leds_gpio[] = {
{
.name = "netgear:amber:test",
.gpio = WNR2200_GPIO_WMAC_LED_TEST_AMBER,
.active_low = 1, .active_low = 1,
}, { }, {
.name = "netgear:green:power", .name = "netgear:green:power",
.gpio = WNR2200_GPIO_LED_PWR_GREEN, .gpio = WNR2200_GPIO_WMAC_LED_POWER_GREEN,
.active_low = 1,
.default_state = LEDS_GPIO_DEFSTATE_ON,
}
};
static struct gpio_keys_button wnr2200_wmac_keys_gpio[] = {
{
.desc = "reset",
.type = EV_KEY,
.code = KEY_RESTART,
.debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
.gpio = WNR2200_GPIO_WMAC_BTN_RESET,
.active_low = 1,
}, {
.desc = "rfkill",
.type = EV_KEY,
.code = KEY_RFKILL,
.debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
.gpio = WNR2200_GPIO_WMAC_BTN_RFKILL,
.active_low = 1,
}, {
.desc = "wps",
.type = EV_KEY,
.code = KEY_WPS_BUTTON,
.debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
.gpio = WNR2200_GPIO_WMAC_BTN_WPS,
.active_low = 1, .active_low = 1,
} }
}; };
@ -139,14 +184,32 @@ static void __init wnr2200_setup(void)
u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
u8 wlan_mac_addr[6]; u8 wlan_mac_addr[6];
/*
* Disable JTAG to use all AR724X GPIO LEDs. Disable CLKs.
* Allow OS to control all link LEDs.
*/
ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE |
AR724X_GPIO_FUNC_UART_EN,
AR724X_GPIO_FUNC_CLK_OBS1_EN |
AR724X_GPIO_FUNC_CLK_OBS2_EN |
AR724X_GPIO_FUNC_CLK_OBS3_EN |
AR724X_GPIO_FUNC_CLK_OBS4_EN |
AR724X_GPIO_FUNC_CLK_OBS5_EN |
AR724X_GPIO_FUNC_GE0_MII_CLK_EN |
AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
ath79_register_mdio(0, 0x0); ath79_register_mdio(0, 0x0);
ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2200_MAC0_OFFSET, 0); ath79_init_mac(ath79_eth0_data.mac_addr, art + WNR2200_MAC0_OFFSET, 0);
ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII; ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ath79_eth0_data.speed = SPEED_100; ath79_eth0_data.speed = SPEED_100;
ath79_eth0_data.duplex = DUPLEX_FULL; ath79_eth0_data.duplex = DUPLEX_FULL;
ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2200_MAC1_OFFSET, 0); ath79_init_mac(ath79_eth1_data.mac_addr, art + WNR2200_MAC1_OFFSET, 0);
ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII; ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ath79_eth1_data.phy_mask = 0x10; ath79_eth1_data.phy_mask = 0x10;
@ -160,12 +223,22 @@ static void __init wnr2200_setup(void)
ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, wlan_mac_addr); ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, wlan_mac_addr);
ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio), ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
wnr2200_leds_gpio); wnr2200_leds_gpio);
ap9x_pci_setup_wmac_led_pin(0, WNR2200_GPIO_WMAC_LED_WLAN_BLUE);
ap9x_pci_setup_wmac_led_name(0, wnr2200_wmac_led_name);
ap9x_pci_setup_wmac_leds(0, wnr2200_wmac_leds_gpio,
ARRAY_SIZE(wnr2200_wmac_leds_gpio));
/* All 3 buttons are connected to wireless chip */
ap9x_pci_setup_wmac_btns(0, wnr2200_wmac_keys_gpio,
ARRAY_SIZE(wnr2200_wmac_keys_gpio),
WNR2200_KEYS_POLL_INTERVAL);
/* enable power for the USB port */ /* enable power for the USB port */
ap9x_pci_setup_wmac_gpio(0, ap9x_pci_setup_wmac_gpio(0, BIT(WNR2200_GPIO_WMAC_USB_5V),
BIT(WNR2200_GPIO_USB_5V), BIT(WNR2200_GPIO_WMAC_USB_5V));
BIT(WNR2200_GPIO_USB_5V));
ath79_register_usb(); ath79_register_usb();
} }