[ar71xx] remove AR71XX_EARLY_SERIAL stuff

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
index 4abecd8a02ea675cdf318fc6f10d66674f0df84c..067f0cedd11bebe468a4f950b9b4c2bde5fae4de 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
@@ -1,7 +1,7 @@
 /*
  *  Compex WP543 board support
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -19,7 +19,8 @@
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 #include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
 
 #define WP543_GPIO_SW6         2
 #define WP543_GPIO_LED_1       3
@@ -31,39 +32,12 @@
 
 #define WP543_BUTTONS_POLL_INTERVAL    20
 
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition wp543_partitions[] = {
-       {
-               .name   = "myloader",
-               .offset = 0,
-               .size   = 0x20000,
-               .mask_flags = MTD_WRITEABLE,
-       } , {
-               .name   = "kernel",
-               .offset = 0x30000,
-               .size   = 0xd0000,
-       } , {
-               .name   = "rootfs",
-               .offset = 0x100000,
-               .size   = 0x100000,
-       }
-};
-#endif /* CONFIG_MTD_PARTITIONS */
-
-static struct flash_platform_data wp543_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
-       .parts          = wp543_partitions,
-       .nr_parts       = ARRAY_SIZE(wp543_partitions),
-#endif
-};
-
 static struct spi_board_info wp543_spi_info[] = {
        {
                .bus_num        = 0,
                .chip_select    = 0,
                .max_speed_hz   = 25000000,
                .modalias       = "m25p80",
-               .platform_data  = &wp543_flash_data,
        }
 };
 
@@ -124,7 +98,10 @@ static void __init wp543_setup(void)
        ar71xx_add_device_spi(NULL, wp543_spi_info, ARRAY_SIZE(wp543_spi_info));
 
        ar71xx_add_device_mdio(0xfffffff7);
-       ar71xx_add_device_eth(0, PHY_INTERFACE_MODE_MII, 0x00000008);
+
+       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+       ar71xx_eth0_data.phy_mask = 0x00000008;
+       ar71xx_add_device_eth(0);
 
        ar71xx_add_device_usb();
 
@@ -138,4 +115,4 @@ static void __init wp543_setup(void)
                                        wp543_gpio_buttons);
 }
 
-MIPS_MACHINE(MACH_AR71XX_WP543, "Compex WP543", wp543_setup);
+MIPS_MACHINE(AR71XX_MACH_WP543, "Compex WP543", wp543_setup);