ar71xx: wndr4300: use KEY_RFKILL code for the Wireless button

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wndr4300.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
index d67b8f85e171f4d4c60eca229d4e1febf03113d3..f546b7171ed377009fe1801d9d26a6b3073d7856 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -36,6 +36,7 @@
 #define WNDR4300_GPIO_LED_USB          13
 #define WNDR4300_GPIO_LED_WAN_GREEN    1
 #define WNDR4300_GPIO_LED_WAN_AMBER    3
+#define WNDR4300_GPIO_LED_WLAN2G       11
 #define WNDR4300_GPIO_LED_WLAN5G       14
 #define WNDR4300_GPIO_LED_WPS_GREEN    16
 #define WNDR4300_GPIO_LED_WPS_AMBER    17
@@ -83,6 +84,11 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = {
                .gpio           = WNDR4300_GPIO_LED_WPS_AMBER,
                .active_low     = 1,
        },
+       {
+               .name           = "netgear:green:wlan2g",
+               .gpio           = WNDR4300_GPIO_LED_WLAN2G,
+               .active_low     = 1,
+       },
        {
                .name           = "netgear:blue:wlan5g",
                .gpio           = WNDR4300_GPIO_LED_WLAN5G,
@@ -110,7 +116,7 @@ static struct gpio_keys_button wndr4300_gpio_keys[] __initdata = {
        {
                .desc           = "Wireless button",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RFKILL,
                .debounce_interval = WNDR4300_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNDR4300_GPIO_BTN_WIRELESS,
                .active_low     = 1,
@@ -155,6 +161,12 @@ static struct mdio_board_info wndr4300_mdio0_info[] = {
 
 static void __init wndr4300_setup(void)
 {
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(wndr4300_leds_gpio); i++)
+               ath79_gpio_output_select(wndr4300_leds_gpio[i].gpio,
+                                        AR934X_GPIO_OUT_GPIO);
+
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wndr4300_leds_gpio),
                                 wndr4300_leds_gpio);
        ath79_register_gpio_keys_polled(-1, WNDR4300_KEYS_POLL_INTERVAL,