linux: ar71xx: add support for Mikrotik Routerboard RB493G

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wr941nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 4f71df66e9aceddea657a49795781ddf15272402..04173ea2691f5ef8c55b9253a47e90d4b1ecc4c2 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -17,7 +17,7 @@
 #include "devices.h"
 #include "dev-dsa.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"
 
@@ -29,7 +29,8 @@
 #define TL_WR941ND_GPIO_BTN_RESET      3
 #define TL_WR941ND_GPIO_BTN_QSS                7
 
-#define TL_WR941ND_BUTTONS_POLL_INTERVAL       20
+#define TL_WR941ND_KEYS_POLL_INTERVAL  20      /* msecs */
+#define TL_WR941ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR941ND_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wr941nd_partitions[] = {
@@ -84,19 +85,19 @@ static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wr941nd_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TL_WR941ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR941ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TL_WR941ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR941ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -136,10 +137,10 @@ static void __init tl_wr941nd_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_leds_gpio),
                                        tl_wr941nd_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WR941ND_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wr941nd_gpio_buttons),
-                                       tl_wr941nd_gpio_buttons);
-       ar913x_add_device_wmac(eeprom, mac);
+       ar71xx_register_gpio_keys_polled(-1, TL_WR941ND_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wr941nd_gpio_keys),
+                                        tl_wr941nd_gpio_keys);
+       ar9xxx_add_device_wmac(eeprom, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TL-WR941ND", "TP-LINK TL-WR941ND",