ar71xx: change PHY select logic, and update phy_masks

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wndr3700.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
index a0eb8d4826110d73ab99cc89884246c6b5ffc4cb..62931e6a11ff87d508e8f2a374ff8a3009e87555 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@@ -2,7 +2,7 @@
  *  Netgear WNDR3700 board support
  *
  *  Copyright (C) 2009 Marco Porsch
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
@@ -29,6 +29,7 @@
 #define WNDR3700_GPIO_LED_POWER_ORANGE 1
 #define WNDR3700_GPIO_LED_POWER_GREEN  2
 #define WNDR3700_GPIO_LED_WPS_GREEN    4
+#define WNDR3700_GPIO_LED_WAN_GREEN    6
 
 #define WNDR3700_GPIO_BTN_WPS          3
 #define WNDR3700_GPIO_BTN_RESET                8
@@ -118,6 +119,10 @@ static struct gpio_led wndr3700_leds_gpio[] __initdata = {
                .name           = "wndr3700:orange:wps",
                .gpio           = WNDR3700_GPIO_LED_WPS_ORANGE,
                .active_low     = 1,
+       }, {
+               .name           = "wndr3700:green:wan",
+               .gpio           = WNDR3700_GPIO_LED_WAN_GREEN,
+               .active_low     = 1,
        }
 };
 
@@ -128,18 +133,21 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
                .code           = BTN_0,
                .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_RESET,
+               .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = BTN_1,
                .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_WPS,
+               .active_low     = 1,
        } , {
                .desc           = "wifi",
                .type           = EV_KEY,
                .code           = BTN_2,
                .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_WIFI,
+               .active_low     = 1,
        }
 };
 
@@ -165,7 +173,6 @@ static void __init wndr3700_setup(void)
        ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
        ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
@@ -191,6 +198,7 @@ static void __init wndr3700_setup(void)
        platform_device_register(&wndr3700_rtl8366s_device);
        platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0);
 
+       ap94_pci_enable_quirk_wndr3700();
        ap94_pci_init(art + WNDR3700_CALDATA0_OFFSET,
                      art + WNDR3700_WMAC0_MAC_OFFSET,
                      art + WNDR3700_CALDATA1_OFFSET,