#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"
+#include "dev-ar9xxx-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#define MZK_W300NH_GPIO_BTN_WPS 12
#define MZK_W300NH_GPIO_BTN_RESET 21
-#define MZK_W04NU_BUTTONS_POLL_INTERVAL 20
+#define MZK_W300NH_KEYS_POLL_INTERVAL 20 /* msecs */
+#define MZK_W300NH_KEYS_DEBOUNCE_INTERVAL (3 * MZK_W300NH_KEYS_POLL_INTERVAL)
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition mzk_w300nh_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
- } , {
+ }, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
- } , {
+ }, {
.name = "kernel",
.offset = 0x050000,
.size = 0x160000,
- } , {
+ }, {
.name = "rootfs",
.offset = 0x1b0000,
- .size = 0x610000,
- } , {
- .name = "config",
- .offset = 0x7c0000,
- .size = 0x020000,
- } , {
+ .size = 0x630000,
+ }, {
.name = "art",
.offset = 0x7e0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
- } , {
+ }, {
.name = "firmware",
.offset = 0x050000,
- .size = 0x770000,
+ .size = 0x790000,
}
};
#endif /* CONFIG_MTD_PARTITIONS */
static struct flash_platform_data mzk_w300nh_flash_data = {
#ifdef CONFIG_MTD_PARTITIONS
- .parts = mzk_w300nh_partitions,
- .nr_parts = ARRAY_SIZE(mzk_w300nh_partitions),
+ .parts = mzk_w300nh_partitions,
+ .nr_parts = ARRAY_SIZE(mzk_w300nh_partitions),
#endif
};
static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
{
- .name = "mzk-w300nh:green:status",
+ .name = "planex:green:status",
.gpio = MZK_W300NH_GPIO_LED_STATUS,
.active_low = 1,
}, {
- .name = "mzk-w300nh:blue:wps",
+ .name = "planex:blue:wps",
.gpio = MZK_W300NH_GPIO_LED_WPS,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:wlan",
+ .name = "planex:green:wlan",
.gpio = MZK_W300NH_GPIO_LED_WLAN,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:ap",
+ .name = "planex:green:ap",
.gpio = MZK_W300NH_GPIO_LED_AP,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:router",
+ .name = "planex:green:router",
.gpio = MZK_W300NH_GPIO_LED_ROUTER,
.active_low = 1,
}
};
-static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = {
+static struct gpio_keys_button mzk_w300nh_gpio_keys[] __initdata = {
{
.desc = "reset",
.type = EV_KEY,
- .code = BTN_0,
- .threshold = 5,
+ .code = KEY_RESTART,
+ .debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
.gpio = MZK_W300NH_GPIO_BTN_RESET,
.active_low = 1,
}, {
.desc = "wps",
.type = EV_KEY,
- .code = BTN_1,
- .threshold = 5,
+ .code = KEY_WPS_BUTTON,
+ .debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
.gpio = MZK_W300NH_GPIO_BTN_WPS,
.active_low = 1,
}, {
.desc = "aprouter",
.type = EV_KEY,
.code = BTN_2,
- .threshold = 5,
+ .debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
.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_m25p80(&mzk_w300nh_flash_data);
ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w300nh_leds_gpio),
- mzk_w300nh_leds_gpio);
+ mzk_w300nh_leds_gpio);
- 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();
+ ar71xx_register_gpio_keys_polled(-1, MZK_W300NH_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(mzk_w300nh_gpio_keys),
+ mzk_w300nh_gpio_keys);
+ ar9xxx_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);