ar71xx: move mach type definitions into a separate include file

[openwrt.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 0809b68..55fde5c 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
@@ -8,18 +8,17 @@
  *  by the Free Software Foundation.
  */
 
-#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 <asm/mips_machine.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
+#include "machtype.h"
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
 #define TL_WR941ND_GPIO_LED_SYSTEM     2
 #define TL_WR941ND_GPIO_LED_QSS                5
@@ -39,15 +38,11 @@ static struct mtd_partition tl_wr941nd_partitions[] = {
        } , {
                .name           = "kernel",
                .offset         = 0x020000,
-               .size           = 0x100000,
+               .size           = 0x140000,
        } , {
                .name           = "rootfs",
-               .offset         = 0x120000,
-               .size           = 0x2c0000,
-       } , {
-               .name           = "config",
-               .offset         = 0x3e0000,
-               .size           = 0x010000,
+               .offset         = 0x160000,
+               .size           = 0x290000,
        } , {
                .name           = "art",
                .offset         = 0x3f0000,
@@ -56,7 +51,7 @@ static struct mtd_partition tl_wr941nd_partitions[] = {
        } , {
                .name           = "firmware",
                .offset         = 0x020000,
-               .size           = 0x3c0000,
+               .size           = 0x3d0000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -68,16 +63,6 @@ static struct flash_platform_data tl_wr941nd_flash_data = {
 #endif
 };
 
-static struct spi_board_info tl_wr941nd_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &tl_wr941nd_flash_data,
-       }
-};
-
 static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
        {
                .name           = "tl-wr941nd:green:system",
@@ -108,6 +93,20 @@ static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = {
        }
 };
 
+static struct dsa_chip_data tl_wr941nd_dsa_chip = {
+       .port_names[0]  = "wan",
+       .port_names[1]  = "lan1",
+       .port_names[2]  = "lan2",
+       .port_names[3]  = "lan3",
+       .port_names[4]  = "lan4",
+       .port_names[5]  = "cpu",
+};
+
+static struct dsa_platform_data tl_wr941nd_dsa_data = {
+       .nr_chips       = 1,
+       .chip           = &tl_wr941nd_dsa_chip,
+};
+
 static void __init tl_wr941nd_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
@@ -122,9 +121,9 @@ static void __init tl_wr941nd_setup(void)
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
        ar71xx_add_device_eth(0);
+       ar71xx_add_device_dsa(0, &tl_wr941nd_dsa_data);
 
-       ar71xx_add_device_spi(NULL, tl_wr941nd_spi_info,
-                                       ARRAY_SIZE(tl_wr941nd_spi_info));
+       ar71xx_add_device_m25p80(&tl_wr941nd_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_leds_gpio),
                                        tl_wr941nd_leds_gpio);
@@ -132,7 +131,7 @@ 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);
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac();
 }
 
 MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TP-LINK TL-WR941ND", tl_wr941nd_setup);