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

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / mach-rt-n15.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
index 18d5337..dcffec0 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
@@ -32,9 +32,9 @@
 #define RT_N15_GPIO_RTL8366_SCK                2
 #define RT_N15_GPIO_RTL8366_SDA                1
 
 #define RT_N15_GPIO_RTL8366_SCK                2
 #define RT_N15_GPIO_RTL8366_SDA                1
 

-#define RT_N15_BUTTONS_POLL_INTERVAL   20
+#define RT_N15_KEYS_POLL_INTERVAL      20
+#define RT_N15_KEYS_DEBOUNCE_INTERVAL  (3 * RT_N15_KEYS_POLL_INTERVAL)

 
 

-#ifdef CONFIG_MTD_PARTITIONS

 static struct mtd_partition rt_n15_partitions[] = {
        {
                .name   = "u-boot",
 static struct mtd_partition rt_n15_partitions[] = {
        {
                .name   = "u-boot",


@@ -65,13 +65,10 @@ static struct mtd_partition rt_n15_partitions[] = {
                .size   = 0x3b0000,
        }
 };
                .size   = 0x3b0000,
        }
 };

-#endif /* CONFIG_MTD_PARTITIONS */

 
 static struct physmap_flash_data rt_n15_flash_data = {
 
 static struct physmap_flash_data rt_n15_flash_data = {

-#ifdef CONFIG_MTD_PARTITIONS

        .nr_parts       = ARRAY_SIZE(rt_n15_partitions),
        .parts          = rt_n15_partitions,
        .nr_parts       = ARRAY_SIZE(rt_n15_partitions),
        .parts          = rt_n15_partitions,

-#endif

 };
 
 static struct gpio_led rt_n15_leds_gpio[] __initdata = {
 };
 
 static struct gpio_led rt_n15_leds_gpio[] __initdata = {


@@ -82,19 +79,19 @@ static struct gpio_led rt_n15_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

-static struct gpio_button rt_n15_gpio_buttons[] __initdata = {
+static struct gpio_keys_button rt_n15_gpio_buttons[] __initdata = {

        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
        {
                .desc           = "reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,

-               .threshold      = 3,
+               .debounce_interval = RT_N15_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = RT_N15_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .gpio           = RT_N15_GPIO_BUTTON_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,

-               .threshold      = 3,
+               .debounce_interval = RT_N15_KEYS_DEBOUNCE_INTERVAL,

                .gpio           = RT_N15_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
                .gpio           = RT_N15_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }


@@ -122,7 +119,7 @@ static void __init rt_n15_init(void)
        ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n15_leds_gpio),
                                  rt_n15_leds_gpio);
 
        ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n15_leds_gpio),
                                  rt_n15_leds_gpio);
 

-       ramips_register_gpio_buttons(-1, RT_N15_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, RT_N15_KEYS_POLL_INTERVAL,

                                     ARRAY_SIZE(rt_n15_gpio_buttons),
                                     rt_n15_gpio_buttons);
 
                                     ARRAY_SIZE(rt_n15_gpio_buttons),
                                     rt_n15_gpio_buttons);