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 1d13ce94dcc94a30bed99aee08f8b38d99e368f5..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,28 +1,24 @@
 /*
  *  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
  *  by the Free Software Foundation.
  */
 
-#include <linux/pci.h>
-#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-#include <linux/input.h>
-#include <linux/ath9k_platform.h>
-
-#include <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
 
+#include "machtype.h"
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ap91-pci.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
 #define TL_WR741ND_GPIO_LED_QSS                0
 #define TL_WR741ND_GPIO_LED_SYSTEM     1
@@ -67,16 +63,6 @@ static struct flash_platform_data tl_wr741nd_flash_data = {
 #endif
 };
 
-static struct spi_board_info tl_wr741nd_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &tl_wr741nd_flash_data,
-       }
-};
-
 static struct gpio_led tl_wr741nd_leds_gpio[] __initdata = {
        {
                .name           = "tl-wr741nd:green:system",
@@ -94,89 +80,54 @@ 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,
        }
 };
 
-#ifdef CONFIG_PCI
-static struct ar71xx_pci_irq tl_wr741nd_pci_irqs[] __initdata = {
-       {
-               .slot   = 0,
-               .pin    = 1,
-               .irq    = AR71XX_PCI_IRQ_DEV0,
-       }
-};
-
-static struct ath9k_platform_data tl_wr741nd_wmac_data;
-
-static int tl_wr741nd_pci_plat_dev_init(struct pci_dev *dev)
-{
-       dev->dev.platform_data = &tl_wr741nd_wmac_data;
-       return 0;
-}
-
-static void tl_wr741nd_pci_init(void)
+static void __init tl_wr741nd_setup(void)
 {
+       u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       memcpy(tl_wr741nd_wmac_data.eeprom_data, ee,
-              sizeof(tl_wr741nd_wmac_data.eeprom_data));
+       ar71xx_add_device_m25p80(&tl_wr741nd_flash_data);
 
-       ar71xx_pci_plat_dev_init = tl_wr741nd_pci_plat_dev_init;
-
-       ar71xx_pci_init(ARRAY_SIZE(tl_wr741nd_pci_irqs), tl_wr741nd_pci_irqs);
-}
-#else
-static inline void tl_wr741nd_pci_init(void) { };
-#endif /* CONFIG_PCI */
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr741nd_leds_gpio),
+                                       tl_wr741nd_leds_gpio);
 
-static void __init tl_wr741nd_setup(void)
-{
-       u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
+       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_spi(NULL, tl_wr741nd_spi_info,
-                                       ARRAY_SIZE(tl_wr741nd_spi_info));
-
-       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);
 
-       tl_wr741nd_pci_init();
+       ap91_pci_init(ee, mac);
 }
-MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TP-LINK TL-WR741ND", tl_wr741nd_setup);
+MIPS_MACHINE(AR71XX_MACH_TL_WR741ND, "TL-WR741ND", "TP-LINK TL-WR741ND",
+            tl_wr741nd_setup);