#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.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"
} , {
.name = "rootfs",
.offset = 0x1b0000,
- .size = 0x610000,
- } , {
- .name = "config",
- .offset = 0x7c0000,
- .size = 0x020000,
+ .size = 0x630000,
} , {
.name = "art",
.offset = 0x7e0000,
} , {
.name = "firmware",
.offset = 0x050000,
- .size = 0x770000,
+ .size = 0x790000,
}
};
#endif /* CONFIG_MTD_PARTITIONS */
{
.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);
+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
- ar71xx_set_mac_base(mac);
+ ar71xx_set_mac_base(eeprom);
- ar71xx_add_device_mdio(0x0);
+ ar71xx_add_device_mdio(MZK_W300NH_MDIO_MASK);
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_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_gpio_buttons(-1, MZK_W04NU_BUTTONS_POLL_INTERVAL,
ARRAY_SIZE(mzk_w300nh_gpio_buttons),
mzk_w300nh_gpio_buttons);
- ar913x_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);