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

[openwrt/openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-bc2.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
index bb225c1f1cc2dc2f9e0428635e787d1c8c43fd1c..4b03b776c7e2a4c5486b1122a2c0f7a1d85f7a51 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-bc2.c
@@ -25,7 +25,8 @@
 #define BC2_GPIO_BUTTON_RESET          17
 #define BC2_GPIO_LED_USB               20
 
-#define BC2_BUTTONS_POLL_INTERVAL      20
+#define BC2_KEYS_POLL_INTERVAL         20
+#define BC2_KEYS_DEBOUNCE_INTERVAL     (3 * BC2_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition bc2_partitions[] = {
        {
@@ -71,12 +72,12 @@ static struct gpio_led bc2_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button bc2_gpio_buttons[] __initdata = {
+static struct gpio_keys_button bc2_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
-               .threshold      = 3,
+               .debounce_interval = BC2_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = BC2_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }
@@ -93,7 +94,7 @@ static void __init bc2_init(void)
        ramips_register_gpio_leds(-1, ARRAY_SIZE(bc2_leds_gpio),
                                  bc2_leds_gpio);
 
-       ramips_register_gpio_buttons(-1, BC2_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, BC2_KEYS_POLL_INTERVAL,
                                     ARRAY_SIZE(bc2_gpio_buttons),
                                     bc2_gpio_buttons);