ar71xx: use the gpio_keys_polled driver instead of gpio_buttons

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
index a9a59e5cf55e75a55d82dec2926126fe7e430bf7..b523b274fd892c87feb6792fa35523b93de5cf63 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
@@ -28,7 +28,9 @@
 #define TL_WR841ND_V1_GPIO_BTN_RESET   3
 #define TL_WR841ND_V1_GPIO_BTN_QSS     7
 
-#define TL_WR841ND_V1_BUTTONS_POLL_INTERVAL    20
+#define TL_WR841ND_V1_KEYS_POLL_INTERVAL       20      /* msecs */
+#define TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL \
+                               (3 * TL_WR841ND_V1_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wr841n_v1_partitions[] = {
@@ -79,19 +81,19 @@ static struct gpio_led tl_wr841n_v1_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wr841n_v1_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wr841n_v1_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR841ND_V1_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = TL_WR841ND_V1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WR841ND_V1_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -131,9 +133,9 @@ static void __init tl_wr841n_v1_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v1_leds_gpio),
                                        tl_wr841n_v1_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WR841ND_V1_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(tl_wr841n_v1_gpio_buttons),
-                                       tl_wr841n_v1_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TL_WR841ND_V1_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wr841n_v1_gpio_keys),
+                                        tl_wr841n_v1_gpio_keys);
 
        pb42_pci_init();
 }