ar71xx: ar913x_wmac device support into a separate file

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tew-632brp.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index 31a5479149d5fa93126b8fa172c40ca8b7dcfd38..340f35da3d16b48f168d211981980d6fdcd9a228 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@@ -12,14 +12,14 @@
 #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 <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ar913x-wmac.h"
 
 #define TEW_632BRP_GPIO_LED_STATUS     1
 #define TEW_632BRP_GPIO_LED_WPS                3
@@ -43,20 +43,20 @@ static struct mtd_partition tew_632brp_partitions[] = {
        } , {
                .name           = "kernel",
                .offset         = 0x030000,
-               .size           = 0x0c0000,
+               .size           = 0x0d0000,
        } , {
                .name           = "rootfs",
-               .offset         = 0x0f0000,
+               .offset         = 0x100000,
                .size           = 0x2f0000,
        } , {
                .name           = "art",
-               .offset         = 0x3e0000,
-               .size           = 0x020000,
+               .offset         = 0x3f0000,
+               .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
                .name           = "firmware",
                .offset         = 0x030000,
-               .size           = 0x3b0000,
+               .size           = 0x3c0000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -68,16 +68,6 @@ static struct flash_platform_data tew_632brp_flash_data = {
 #endif
 };
 
-static struct spi_board_info tew_632brp_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &tew_632brp_flash_data,
-       }
-};
-
 static struct gpio_led tew_632brp_leds_gpio[] __initdata = {
        {
                .name           = "tew-632brp:green:status",
@@ -112,17 +102,20 @@ static struct gpio_button tew_632brp_gpio_buttons[] __initdata = {
 
 static void __init tew_632brp_setup(void)
 {
-       ar71xx_add_device_mdio(0xfffffffe);
+       ar71xx_add_device_mdio(0x0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0x0;
+       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
+       ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth1_data.phy_mask = 0x10;
+
        ar71xx_add_device_eth(0);
+       ar71xx_add_device_eth(1);
 
-       ar71xx_add_device_spi(NULL, tew_632brp_spi_info,
-                                       ARRAY_SIZE(tew_632brp_spi_info));
+       ar71xx_add_device_m25p80(&tew_632brp_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
                                        tew_632brp_leds_gpio);
@@ -131,7 +124,7 @@ static void __init tew_632brp_setup(void)
                                        ARRAY_SIZE(tew_632brp_gpio_buttons),
                                        tew_632brp_gpio_buttons);
 
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac();
 }
 
 MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TRENDnet TEW-632BRP", tew_632brp_setup);