X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Fath79%2Fmach-wndr4300.c;h=ae72ab66c43d95a0222fc6c5e1f315a148440d1d;hb=bdd15aaef2245139178ba2ce316d08ee60768e4c;hp=a89b8b6827dafc11fd9a15f5a46641a028da6a3b;hpb=7559d9dda9d8fd0485a285842810d49a30004927;p=openwrt.git

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 a89b8b6827..ae72ab66c4 100644
--- 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,
@@ -186,8 +196,13 @@ 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_WNDR4300, "WNDR4300", "NETGEAR WNDR4300",
+MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR3700v4/WNDR4300",
 	     wndr4300_setup);