ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wa901nd-v2.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
index 72a8bd21f6ca566c932b553ca1745af31423c313..7fb4d80aefc6a7d0009e1c8963683f9c7c8c2663 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
@@ -30,8 +30,9 @@
 #define TL_WA901ND_V2_GPIO_BTN_RESET           3
 #define TL_WA901ND_V2_GPIO_BTN_QSS             7
 
-#define TL_WA901ND_V2_BUTTONS_POLL_INTERVAL    20
-
+#define TL_WA901ND_V2_KEYS_POLL_INTERVAL       20      /* msecs */
+#define TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL   \
+                                       (3 * TL_WA901ND_V2_KEYS_POLL_INTERVAL)
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wa901nd_v2_partitions[] = {
        {
@@ -82,19 +83,19 @@ static struct gpio_led tl_wa901nd_v2_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wa901nd_v2_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wa901nd_v2_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_V2_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_V2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_V2_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -120,9 +121,9 @@ static void __init tl_wa901nd_v2_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_v2_leds_gpio),
                                        tl_wa901nd_v2_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WA901ND_V2_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wa901nd_v2_gpio_buttons),
-                                       tl_wa901nd_v2_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TL_WA901ND_V2_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wa901nd_v2_gpio_keys),
+                                        tl_wa901nd_v2_gpio_keys);
 
         ar9xxx_add_device_wmac(eeprom, mac);
 }