ar71xx: Add support for WZR-HP-G301NH

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tew-632brp.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index 787f83eb01d0ee06bd9c5709e0909895cf9f661a..9816f0336a9aa96c29be39e983c649d0cb186cea 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.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"
 #include "nvram.h"
@@ -40,24 +40,24 @@ static struct mtd_partition tew_632brp_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "config",
                .offset         = 0x020000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x030000,
                .size           = 0x0d0000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x100000,
                .size           = 0x2f0000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x030000,
                .size           = 0x3c0000,
@@ -67,8 +67,8 @@ static struct mtd_partition tew_632brp_partitions[] = {
 
 static struct flash_platform_data tew_632brp_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tew_632brp_partitions,
-        .nr_parts       = ARRAY_SIZE(tew_632brp_partitions),
+       .parts          = tew_632brp_partitions,
+       .nr_parts       = ARRAY_SIZE(tew_632brp_partitions),
 #endif
 };
 
@@ -92,13 +92,13 @@ static struct gpio_button tew_632brp_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RESTART,
                .threshold      = 3,
                .gpio           = TEW_632BRP_GPIO_BTN_RESET,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = KEY_WPS_BUTTON,
                .threshold      = 3,
                .gpio           = TEW_632BRP_GPIO_BTN_WPS,
        }
@@ -117,8 +117,9 @@ static void __init tew_632brp_setup(void)
        u8 *wlan_mac = NULL;
 
        if (nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
-                                "lan_mac=", mac) == 0) {
-               ar71xx_set_mac_base(mac);
+                               "lan_mac=", mac) == 0) {
+               ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+               ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
                wlan_mac = mac;
        }
 
@@ -142,7 +143,7 @@ static void __init tew_632brp_setup(void)
                                        ARRAY_SIZE(tew_632brp_gpio_buttons),
                                        tew_632brp_gpio_buttons);
 
-       ar913x_add_device_wmac(eeprom, wlan_mac);
+       ar9xxx_add_device_wmac(eeprom, wlan_mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP",