ar71xx: add support for the AP121/AP121-MINI reference boards

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-mzk-w04nu.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
index 2f5d41618501c51f2cd11b8ac7521d743308eb9b..54dbe35fc8038809c00d5723857f0b7c1c046cd5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -32,7 +32,8 @@
 #define MZK_W04NU_GPIO_BTN_WPS         12
 #define MZK_W04NU_GPIO_BTN_RESET       21
 
-#define MZK_W04NU_BUTTONS_POLL_INTERVAL        20
+#define MZK_W04NU_KEYS_POLL_INTERVAL   20      /* msecs */
+#define MZK_W04NU_KEYS_DEBOUNCE_INTERVAL (3 * MZK_W04NU_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition mzk_w04nu_partitions[] = {
@@ -101,26 +102,26 @@ static struct gpio_led mzk_w04nu_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button mzk_w04nu_gpio_buttons[] __initdata = {
+static struct gpio_keys_button mzk_w04nu_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = MZK_W04NU_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = MZK_W04NU_GPIO_BTN_WPS,
                .active_low     = 1,
        }, {
                .desc           = "aprouter",
                .type           = EV_KEY,
                .code           = BTN_2,
-               .threshold      = 3,
+               .debounce_interval = MZK_W04NU_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = MZK_W04NU_GPIO_BTN_APROUTER,
                .active_low     = 0,
        }
@@ -153,9 +154,9 @@ static void __init mzk_w04nu_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w04nu_leds_gpio),
                                        mzk_w04nu_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, MZK_W04NU_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(mzk_w04nu_gpio_buttons),
-                                       mzk_w04nu_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, MZK_W04NU_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(mzk_w04nu_gpio_keys),
+                                        mzk_w04nu_gpio_keys);
        ar71xx_add_device_usb();
 
        ar9xxx_add_device_wmac(eeprom, NULL);