ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac

[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 6fb2312a236025213ea4df78de6d06122265c37a..03ffe5e6868b639ddea47edd205becc32ea8fb86 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
@@ -17,7 +17,7 @@
 #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"
 
@@ -40,39 +40,35 @@ 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
 };
 
@@ -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;
 
@@ -150,12 +146,12 @@ static void __init mzk_w300nh_setup(void)
        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(eeprom, NULL);
+                                       ARRAY_SIZE(mzk_w300nh_gpio_buttons),
+                                       mzk_w300nh_gpio_buttons);
+       ar9xxx_add_device_wmac(eeprom, NULL);
 }
 
 MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH",