ar71xx: change PHY select logic, and update phy_masks

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index da26cc51bb8b355796c2a8ef1105d3d12e6385ff..0c648939f9b31df4a971ee51fac86d2fa500ff9f 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -1,7 +1,7 @@
 /*
  *  TP-LINK TL-WR941ND board support
  *
- *  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
@@ -22,7 +22,8 @@
 #include "dev-leds-gpio.h"
 
 #define TL_WR941ND_GPIO_LED_SYSTEM     2
-#define TL_WR941ND_GPIO_LED_QSS                5
+#define TL_WR941ND_GPIO_LED_QSS_RED    4
+#define TL_WR941ND_GPIO_LED_QSS_GREEN  5
 
 #define TL_WR941ND_GPIO_BTN_RESET      3
 #define TL_WR941ND_GPIO_BTN_QSS                7
@@ -71,8 +72,10 @@ static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
                .active_low     = 1,
        }, {
                .name           = "tl-wr941nd:red:qss",
-               .gpio           = TL_WR941ND_GPIO_LED_QSS,
-               .active_low     = 1,
+               .gpio           = TL_WR941ND_GPIO_LED_QSS_RED,
+       }, {
+               .name           = "tl-wr941nd:green:qss",
+               .gpio           = TL_WR941ND_GPIO_LED_QSS_GREEN,
        }
 };
 
@@ -81,14 +84,14 @@ static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = TL_WR941ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = TL_WR941ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -111,13 +114,13 @@ static struct dsa_platform_data tl_wr941nd_dsa_data = {
 static void __init tl_wr941nd_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
        ar71xx_set_mac_base(mac);
 
        ar71xx_add_device_mdio(0x0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0x0;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
@@ -132,7 +135,8 @@ static void __init tl_wr941nd_setup(void)
        ar71xx_add_device_gpio_buttons(-1, TL_WR941ND_BUTTONS_POLL_INTERVAL,
                                        ARRAY_SIZE(tl_wr941nd_gpio_buttons),
                                        tl_wr941nd_gpio_buttons);
-       ar913x_add_device_wmac();
+       ar913x_add_device_wmac(eeprom, mac);
 }
 
-MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TP-LINK TL-WR941ND", tl_wr941nd_setup);
+MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND",
+            tl_wr941nd_setup);