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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30461 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 6 insertions, 5 deletions

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 63071da65..afe51d71e 100644
--- 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,7 +28,8 @@
 #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)
 
 static struct mtd_partition nbg_419n_partitions[] = {
 	{
@@ -70,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,
-		.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,
-		.threshold	= 3,
+		.debounce_interval = NBG_419N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= NBG_419N_GPIO_BUTTON_WPS,
 		.active_low	= 1,
 	}
@@ -97,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);
-	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();