ar71xx: use the new ar7240 switch driver for tl-wa901nd as well

SVN-Revision: 23576

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
index a0e14102060535ee2830f8cd1a393858e6878bf0..87c59046cc72926052afd20a71c3b6aae7082f35 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
@@ -196,7 +196,6 @@ config AR71XX_MACH_TL_WA901ND
        bool "TP-LINK TL-WA901ND support"
        select AR71XX_DEV_M25P80
        select AR71XX_DEV_AP91_PCI if PCI
        bool "TP-LINK TL-WA901ND support"
        select AR71XX_DEV_M25P80
        select AR71XX_DEV_AP91_PCI if PCI

-       select AR71XX_DEV_DSA

        select AR71XX_DEV_GPIO_BUTTONS
        select AR71XX_DEV_LEDS_GPIO
        default n
        select AR71XX_DEV_GPIO_BUTTONS
        select AR71XX_DEV_LEDS_GPIO
        default n

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
index ea4135a3d00ace4b322d77c301a4bc2dbdbeb9a9..da694683948797cb00ec03e882270855efe1b402 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
@@ -16,7 +16,6 @@
 
 #include "machtype.h"
 #include "devices.h"
 
 #include "machtype.h"
 #include "devices.h"

-#include "dev-dsa.h"

 #include "dev-m25p80.h"
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"
 #include "dev-m25p80.h"
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"


@@ -95,16 +94,6 @@ static struct gpio_button tl_wa901nd_gpio_buttons[] __initdata = {
        }
 };
 
        }
 };
 

-static struct dsa_chip_data tl_wa901nd_v1_dsa_chip = {
-       .port_names[0]  = "cpu",
-       .port_names[1]  = "lan",
-};
-
-static struct dsa_platform_data tl_wa901nd_v1_dsa_data = {
-       .nr_chips       = 1,
-       .chip           = &tl_wa901nd_v1_dsa_chip,
-};
-

 static void __init tl_wa901nd_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
 static void __init tl_wa901nd_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);


@@ -119,12 +108,11 @@ static void __init tl_wa901nd_setup(void)
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.speed       = SPEED_1000;
        ar71xx_eth1_data.duplex      = DUPLEX_FULL;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.speed       = SPEED_1000;
        ar71xx_eth1_data.duplex      = DUPLEX_FULL;

+       ar71xx_eth1_data.has_ar7240_switch = 1;

 
        ar71xx_add_device_mdio(0x0);
        ar71xx_add_device_eth(1);
 
 
        ar71xx_add_device_mdio(0x0);
        ar71xx_add_device_eth(1);
 

-       ar71xx_add_device_dsa(1, &tl_wa901nd_v1_dsa_data);
-

        ar71xx_add_device_m25p80(&tl_wa901nd_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_leds_gpio),
        ar71xx_add_device_m25p80(&tl_wa901nd_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_leds_gpio),