ar71xx: sync ethernet driver changes with trunk to fix MDIO issues on ar7240

[openwrt-10.03/.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wr741nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
index b2d33c0d7775b79f181ca670705f64779fdd8fff..c5365fe67a4df7e755865cf6de0032505736d6f9 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
@@ -1,7 +1,7 @@
 /*
  *  TP-LINK TL-WR741ND 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
@@ -80,14 +80,14 @@ static struct gpio_button tl_wr741nd_gpio_buttons[] __initdata = {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = TL_WR741ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = TL_WR741ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -98,40 +98,36 @@ static void __init tl_wr741nd_setup(void)
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
+       ar71xx_add_device_m25p80(&tl_wr741nd_flash_data);
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
+                                       tl_wr741nd_leds_gpio);
+
+       ar71xx_add_device_gpio_buttons(-1, TL_WR741ND_BUTTONS_POLL_INTERVAL,
+                                       ARRAY_SIZE(tl_wr741nd_gpio_buttons),
+                                       tl_wr741nd_gpio_buttons);
+
+       ar71xx_eth1_data.has_ar7240_switch = 1;
        ar71xx_set_mac_base(mac);
-       ar71xx_add_device_mdio(0x0);
 
        /* WAN port */
        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;
-       ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
-       ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
-       ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
+       ar71xx_eth0_data.phy_mask = BIT(4);
 
        /* LAN ports */
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.phy_mask = 0x0;
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
-       ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
-       ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
-       ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
 
+       ar71xx_add_device_mdio(0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 
-       ar71xx_add_device_m25p80(&tl_wr741nd_flash_data);
-
-       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
-                                       tl_wr741nd_leds_gpio);
-
-       ar71xx_add_device_gpio_buttons(-1, TL_WR741ND_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wr741nd_gpio_buttons),
-                                       tl_wr741nd_gpio_buttons);
+       ap91_pci_setup_wmac_led_pin(1);
 
-       ap91_pci_init(ee, NULL);
+       ap91_pci_init(ee, mac);
 }
 MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",
             tl_wr741nd_setup);