[ar71xx] remove remaining references to dev-ap91-eth.h, patch by Stijn Tintel

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
index 49cc2ac3f79b5b4fa1df560476c0d729fc24f00e..4d5df02cfc8fd4d6f776da4846d6e16d67decd9e 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -9,18 +9,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 MZK_W300NH_GPIO_LED_STATUS     1
 #define MZK_W300NH_GPIO_LED_WPS                3
@@ -52,11 +51,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
        } , {
                .name           = "rootfs",
                .offset         = 0x1b0000,
-               .size           = 0x610000,
-       } , {
-               .name           = "config",
-               .offset         = 0x7c0000,
-               .size           = 0x020000,
+               .size           = 0x630000,
        } , {
                .name           = "art",
                .offset         = 0x7e0000,
@@ -65,7 +60,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
        } , {
                .name           = "firmware",
                .offset         = 0x050000,
-               .size           = 0x770000,
+               .size           = 0x790000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -77,16 +72,6 @@ static struct flash_platform_data mzk_w300nh_flash_data = {
 #endif
 };
 
-static struct spi_board_info mzk_w300nh_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &mzk_w300nh_flash_data,
-       }
-};
-
 static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
        {
                .name           = "mzk-w300nh:green:status",
@@ -115,49 +100,50 @@ static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = MZK_W300NH_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = MZK_W300NH_GPIO_BTN_WPS,
                .active_low     = 1,
        }, {
                .desc           = "aprouter",
                .type           = EV_KEY,
                .code           = BTN_2,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = MZK_W300NH_GPIO_BTN_APROUTER,
                .active_low     = 0,
        }
 };
 
+#define MZK_W300NH_WAN_PHYMASK BIT(4)
+#define MZK_W300NH_MDIO_MASK   (~MZK_W300NH_WAN_PHYMASK)
+
 static void __init mzk_w300nh_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
-
-       ar71xx_set_mac_base(mac);
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(MZK_W300NH_MDIO_MASK);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_data.has_ar8216 = 1;
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, eeprom, 1);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.phy_mask = 0x10;
+       ar71xx_eth1_data.phy_mask = MZK_W300NH_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);
        ar71xx_add_device_eth(1);
 
-       ar71xx_add_device_spi(NULL, mzk_w300nh_spi_info,
-                             ARRAY_SIZE(mzk_w300nh_spi_info));
+       ar71xx_add_device_m25p80(&mzk_w300nh_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w300nh_leds_gpio),
                                    mzk_w300nh_leds_gpio);
@@ -165,7 +151,8 @@ static void __init mzk_w300nh_setup(void)
        ar71xx_add_device_gpio_buttons(-1, MZK_W04NU_BUTTONS_POLL_INTERVAL,
                                       ARRAY_SIZE(mzk_w300nh_gpio_buttons),
                                       mzk_w300nh_gpio_buttons);
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac(eeprom, NULL);
 }
 
-MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "Planex MZK-W300NH", mzk_w300nh_setup);
+MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH",
+            mzk_w300nh_setup);