X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Fath79%2Fmach-wndap360.c;h=e70d88b40788b5580dd60e460eed1e7c4df2fd5c;hb=76306202e7eb188171fb9cb8ad7eaa18bf7a5a69;hp=3d8d6b0af1423512b699d402a773bbdf93a3d2da;hpb=ba362f8845d0ccba99af34fc21652e6736c72816;p=openwrt.git

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
index 3d8d6b0af1..e70d88b407 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
@@ -22,16 +22,13 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-m25p80.h"
-#include "dev-usb.h"
 #include "machtypes.h"
 
 #define WNDAP360_GPIO_LED_POWER_ORANGE		0
 #define WNDAP360_GPIO_LED_POWER_GREEN		2
 
 /* Reset button - next to the power connector */
-#define WNDAP360_GPIO_BTN_RESET		3
-/* WPS button - next to a led on right */
-#define WNDAP360_GPIO_BTN_WPS		8
+#define WNDAP360_GPIO_BTN_RESET			8
 
 #define WNDAP360_KEYS_POLL_INTERVAL		20	/* msecs */
 #define WNDAP360_KEYS_DEBOUNCE_INTERVAL	(3 * WNDAP360_KEYS_POLL_INTERVAL)
@@ -47,11 +44,11 @@
  */
 static struct gpio_led wndap360_leds_gpio[] __initdata = {
 	{
-		.name		= "wndap360:green:power",
+		.name		= "netgear:green:power",
 		.gpio		= WNDAP360_GPIO_LED_POWER_GREEN,
 		.active_low	= 1,
 	}, {
-		.name		= "wndap360:orange:power",
+		.name		= "netgear:orange:power",
 		.gpio		= WNDAP360_GPIO_LED_POWER_ORANGE,
 		.active_low	= 1,
         }
@@ -76,7 +73,9 @@ static void __init wndap360_setup(void)
 
 	ath79_register_mdio(0, ~(WNDAP360_LAN_PHYMASK));
 
-	ath79_init_mac(ath79_eth0_data.mac_addr, art, 0);
+	/* Reusing wifi MAC with offset of 1 as eth0 MAC */
+	ath79_init_mac(ath79_eth0_data.mac_addr,
+		       art + WNDAP360_WMAC0_MAC_OFFSET, 1);
 	ath79_eth0_pll_data.pll_1000 = 0x11110000;
 	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
 	ath79_eth0_data.phy_mask = WNDAP360_LAN_PHYMASK;
@@ -85,8 +84,6 @@ static void __init wndap360_setup(void)
 
 	ath79_register_eth(0);
 
-	ath79_register_usb();
-
 	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(wndap360_leds_gpio),
@@ -96,6 +93,9 @@ static void __init wndap360_setup(void)
 					 ARRAY_SIZE(wndap360_gpio_keys),
 					 wndap360_gpio_keys);
 
+	ap9x_pci_setup_wmac_led_pin(0, 5);
+	ap9x_pci_setup_wmac_led_pin(1, 5);
+
 	ap94_pci_init(art + WNDAP360_CALDATA0_OFFSET,
 		      art + WNDAP360_WMAC0_MAC_OFFSET,
 		      art + WNDAP360_CALDATA1_OFFSET,