ar71xx: move gpio-buttons support into a spearate file

[librecmc/librecmc.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-mzk-w04nu.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
index 37019ae4c22f832ed2484f0923ab74f51e3333a0..a3d71f6242726d2052bfe375b1a6b271b2a8855a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -13,12 +13,14 @@
 #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 <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
+#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
 #define MZK_W04NU_GPIO_LED_USB         0
 #define MZK_W04NU_GPIO_LED_STATUS      1
@@ -45,22 +47,22 @@ static struct mtd_partition mzk_w04nu_partitions[] = {
                .offset         = 0x040000,
                .size           = 0x010000,
        } , {
-               .name           = "uImage",
+               .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,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -137,12 +139,17 @@ static struct gpio_button mzk_w04nu_gpio_buttons[] __initdata = {
 
 static void __init mzk_w04nu_setup(void)
 {
+       u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
+
+       ar71xx_set_mac_base(mac);
+
        ar71xx_add_device_mdio(0x0);
 
        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;
@@ -161,7 +168,7 @@ static void __init mzk_w04nu_setup(void)
                                        mzk_w04nu_gpio_buttons);
        ar71xx_add_device_usb();
 
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac();
 }
 
 MIPS_MACHINE(AR71XX_MACH_MZK_W04NU, "Planex MZK-W04NU", mzk_w04nu_setup);