[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 dfe7d0d6f988676267cdeb8f5273515a23a5ac5d..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
@@ -51,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,
@@ -64,7 +60,7 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
        } , {
                .name           = "firmware",
                .offset         = 0x050000,
-               .size           = 0x770000,
+               .size           = 0x790000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -104,14 +100,14 @@ static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RESTART,
                .threshold      = 3,
                .gpio           = MZK_W300NH_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = KEY_WPS_BUTTON,
                .threshold      = 3,
                .gpio           = MZK_W300NH_GPIO_BTN_WPS,
                .active_low     = 1,
@@ -132,15 +128,15 @@ static void __init mzk_w300nh_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(eeprom);
-
        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.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 = MZK_W300NH_WAN_PHYMASK;