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.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
index da694683948797cb00ec03e882270855efe1b402..4a108feba188dfe0a1858eac8ae95fa49972168b 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
@@ -27,7 +27,8 @@
 #define TL_WA901ND_GPIO_BTN_RESET      11
 #define TL_WA901ND_GPIO_BTN_QSS                12
 
-#define TL_WA901ND_BUTTONS_POLL_INTERVAL       20
+#define TL_WA901ND_KEYS_POLL_INTERVAL  20      /* msecs */
+#define TL_WA901ND_KEYS_DEBOUNCE_INTERVAL (3 * TL_WA901ND_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tl_wa901nd_partitions[] = {
@@ -36,20 +37,20 @@ static struct mtd_partition tl_wa901nd_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x020000,
                .size           = 0x140000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x160000,
                .size           = 0x290000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x020000,
                .size           = 0x3d0000,
@@ -59,8 +60,8 @@ static struct mtd_partition tl_wa901nd_partitions[] = {
 
 static struct flash_platform_data tl_wa901nd_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tl_wa901nd_partitions,
-        .nr_parts       = ARRAY_SIZE(tl_wa901nd_partitions),
+       .parts          = tl_wa901nd_partitions,
+       .nr_parts       = ARRAY_SIZE(tl_wa901nd_partitions),
 #endif
 };
 
@@ -76,19 +77,19 @@ static struct gpio_led tl_wa901nd_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button tl_wa901nd_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tl_wa901nd_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 3,
+               .debounce_interval = TL_WA901ND_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = TL_WA901ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -116,14 +117,14 @@ static void __init tl_wa901nd_setup(void)
        ar71xx_add_device_m25p80(&tl_wa901nd_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wa901nd_leds_gpio),
-                                   tl_wa901nd_leds_gpio);
+                                       tl_wa901nd_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, TL_WA901ND_BUTTONS_POLL_INTERVAL,
-                                      ARRAY_SIZE(tl_wa901nd_gpio_buttons),
-                                      tl_wa901nd_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, TL_WA901ND_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(tl_wa901nd_gpio_keys),
+                                        tl_wa901nd_gpio_keys);
 
        ap91_pci_init(ee, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_TL_WA901ND, "TL-WA901ND", "TP-LINK TL-WA901ND",
-             tl_wa901nd_setup);
+            tl_wa901nd_setup);