ar71xx: WNDR4300: Fix switch HW controlled LEDs

[openwrt/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 a89b8b6827dafc11fd9a15f5a46641a028da6a3b..2a00a0ed961faf8c0e538c04f2b2455db190b6db 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -1,5 +1,5 @@
 /*
- *  NETGEAR WNDR4300 board support
+ *  NETGEAR WNDR3700v4/WNDR4300 board support
  *
  *  Copyright (C) 2012 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2014 Ralph Perlich <rpsoft@arcor.de>
@@ -31,11 +31,13 @@
 #include "dev-wmac.h"
 #include "machtypes.h"
 
+/* AR9344 GPIOs */
 #define WNDR4300_GPIO_LED_POWER_GREEN  0
 #define WNDR4300_GPIO_LED_POWER_AMBER  2
 #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
@@ -44,6 +46,9 @@
 #define WNDR4300_GPIO_BTN_WIRELESS     15
 #define WNDR4300_GPIO_BTN_WPS          12
 
+/* AR9580 GPIOs */
+#define WNDR4300_GPIO_USB_5V           0
+
 #define WNDR4300_KEYS_POLL_INTERVAL    20      /* msecs */
 #define WNDR4300_KEYS_DEBOUNCE_INTERVAL        (3 * WNDR4300_KEYS_POLL_INTERVAL)
 
@@ -83,6 +88,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 +120,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,
@@ -126,11 +136,11 @@ static struct ar8327_pad_cfg wndr4300_ar8327_pad0_cfg = {
 };
 
 static struct ar8327_led_cfg wndr4300_ar8327_led_cfg = {
-       .led_ctrl0 = 0xc737c737,
-       .led_ctrl1 = 0x00000000,
+       .led_ctrl0 = 0xcc35cc35,
+       .led_ctrl1 = 0xcb37cb37,
        .led_ctrl2 = 0x00000000,
-       .led_ctrl3 = 0x0030c300,
-       .open_drain = false,
+       .led_ctrl3 = 0x00f3cf00,
+       .open_drain = true,
 };
 
 static struct ar8327_platform_data wndr4300_ar8327_data = {
@@ -186,8 +196,15 @@ static void __init wndr4300_setup(void)
        ath79_register_usb();
 
        ath79_register_wmac_simple();
+
+       /* enable power for the USB port */
+       ap9x_pci_setup_wmac_gpio(0, BIT(WNDR4300_GPIO_USB_5V),
+                                BIT(WNDR4300_GPIO_USB_5V));
+
        ap91_pci_init_simple();
 }
 
+MIPS_MACHINE(ATH79_MACH_WNDR3700_V4, "WNDR3700_V4", "NETGEAR WNDR3700v4",
+            wndr4300_setup);
 MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR4300",
             wndr4300_setup);