ar71xx: do general formatting on wnr2000-v4

[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 d67b8f8..2884c6c 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)
 
@@ -84,6 +89,11 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = {
                .active_low     = 1,
        },
        {
+               .name           = "netgear:green:wlan2g",
+               .gpio           = WNDR4300_GPIO_LED_WLAN2G,
+               .active_low     = 1,
+       },
+       {
                .name           = "netgear:blue:wlan5g",
                .gpio           = WNDR4300_GPIO_LED_WLAN5G,
                .active_low     = 1,
@@ -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,
@@ -155,6 +165,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,
@@ -180,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);