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

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
index 4227654..afe51d7 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-nbg-419n.c
@@ -28,9 +28,9 @@
 #define NBG_419N_GPIO_BUTTON_WPS       0       /* active low */
 #define NBG_419N_GPIO_BUTTON_RESET     10      /* active low */
 
 #define NBG_419N_GPIO_BUTTON_WPS       0       /* active low */
 #define NBG_419N_GPIO_BUTTON_RESET     10      /* active low */
 

-#define NBG_419N_BUTTONS_POLL_INTERVAL 20
+#define NBG_419N_KEYS_POLL_INTERVAL    20
+#define NBG_419N_KEYS_DEBOUNCE_INTERVAL        (3 * NBG_419N_KEYS_POLL_INTERVAL)

 
 

-#ifdef CONFIG_MTD_PARTITIONS

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


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

-#endif /* CONFIG_MTD_PARTITIONS */

 
 static struct physmap_flash_data nbg_419n_flash_data = {
 
 static struct physmap_flash_data nbg_419n_flash_data = {

-#ifdef CONFIG_MTD_PARTITIONS

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

-#endif

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


@@ -74,19 +71,19 @@ static struct gpio_led nbg_419n_leds_gpio[] __initdata = {
        }
 };
 
        }
 };
 

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

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

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

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

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

                .gpio           = NBG_419N_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }
                .gpio           = NBG_419N_GPIO_BUTTON_WPS,
                .active_low     = 1,
        }


@@ -101,7 +98,7 @@ static void __init nbg_419n_init(void)
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nbg_419n_leds_gpio),
                                  nbg_419n_leds_gpio);
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(nbg_419n_leds_gpio),
                                  nbg_419n_leds_gpio);

-       ramips_register_gpio_buttons(-1, NBG_419N_BUTTONS_POLL_INTERVAL,
+       ramips_register_gpio_buttons(-1, NBG_419N_KEYS_POLL_INTERVAL,

                                     ARRAY_SIZE(nbg_419n_gpio_buttons),
                                     nbg_419n_gpio_buttons);
        rt305x_register_wifi();
                                     ARRAY_SIZE(nbg_419n_gpio_buttons),
                                     nbg_419n_gpio_buttons);
        rt305x_register_wifi();