ramips: use gpio-keys-polled instead of gpio-buttons

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / mach-f5d8235-v1.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
index 71c84c14671bce67c37f9c8ad696a709f710a50e..850dc4bd7dd6bbc1c1dd9b8b49783d589027cd26 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
@@ -35,7 +35,8 @@
 #define F5D8235_GPIO_BUTTON_WPS                0
 #define F5D8235_GPIO_BUTTON_RESET      9
 
-#define F5D8235_BUTTONS_POLL_INTERVAL  20
+#define F5D8235_KEYS_POLL_INTERVAL     20
+#define F5D8235_KEYS_DEBOUNCE_INTERVAL (3 * F5D8235_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition f5d8235_partitions[] = {
        {
@@ -92,19 +93,19 @@ static struct gpio_led f5d8235_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button f5d8235_gpio_buttons[] __initdata = {
+static struct gpio_keys_button f5d8235_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = F5D8235_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = F5D8235_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
-               .threshold      = 3,
+               .debounce_interval = F5D8235_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = F5D8235_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
@@ -121,7 +122,7 @@ static void __init f5d8235_init(void)
        ramips_register_gpio_leds(-1, ARRAY_SIZE(f5d8235_leds_gpio),
                                  f5d8235_leds_gpio);
 
-       ramips_register_gpio_buttons(-1, F5D8235_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, F5D8235_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(f5d8235_gpio_buttons),
                                     f5d8235_gpio_buttons);