ar71xx: use the tp-link parser on the tp-link boards

[openwrt.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 7bbec12668f6bfdf123a057ddb364de516ee8d7a..b7f9cb683d008c53d434ede993b2a8a4412f4315 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"
@@ -28,7 +28,8 @@
 #define TEW_632BRP_GPIO_BTN_WPS                12
 #define TEW_632BRP_GPIO_BTN_RESET      21
 
-#define TEW_632BRP_BUTTONS_POLL_INTERVAL       20
+#define TEW_632BRP_KEYS_POLL_INTERVAL  20      /* msecs */
+#define TEW_632BRP_KEYS_DEBOUNCE_INTERVAL (3 * TEW_632BRP_KEYS_POLL_INTERVAL)
 
 #define TEW_632BRP_CONFIG_ADDR 0x1f020000
 #define TEW_632BRP_CONFIG_SIZE 0x10000
@@ -47,11 +48,11 @@ static struct mtd_partition tew_632brp_partitions[] = {
        }, {
                .name           = "kernel",
                .offset         = 0x030000,
-               .size           = 0x0d0000,
+               .size           = 0x0e0000,
        }, {
                .name           = "rootfs",
-               .offset         = 0x100000,
-               .size           = 0x2f0000,
+               .offset         = 0x110000,
+               .size           = 0x2e0000,
        }, {
                .name           = "art",
                .offset         = 0x3f0000,
@@ -88,18 +89,18 @@ static struct gpio_led tew_632brp_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tew_632brp_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tew_632brp_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TEW_632BRP_GPIO_BTN_RESET,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TEW_632BRP_GPIO_BTN_WPS,
        }
 };
@@ -123,7 +124,7 @@ static void __init tew_632brp_setup(void)
                wlan_mac = mac;
        }
 
-       ar71xx_add_device_mdio(TEW_632BRP_MDIO_MASK);
+       ar71xx_add_device_mdio(0, TEW_632BRP_MDIO_MASK);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = TEW_632BRP_LAN_PHYMASK;
@@ -139,11 +140,11 @@ static void __init tew_632brp_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
                                        tew_632brp_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TEW_632BRP_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tew_632brp_gpio_buttons),
-                                       tew_632brp_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TEW_632BRP_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tew_632brp_gpio_keys),
+                                        tew_632brp_gpio_keys);
 
-       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",