X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Ffiles%2Farch%2Fmips%2Fralink%2Frt305x%2Fmach-all0256n.c;h=cd25c4345b14f5191e14e339bf5d0bf3a5918de7;hp=3a53e16d075dd4f2d3262a03b35dcfbcb9d84a2d;hb=7dfbfac36b02e58a36c8f0a6aa2155d70e070919;hpb=c0d57ff6bf00079b82a8ffb7f844b34ebc63e9c6

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
index 3a53e16d07..cd25c4345b 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-all0256n.c
@@ -28,7 +28,8 @@
 #define ALL0256N_GPIO_LED_RSSI_LOW 14
 #define ALL0256N_GPIO_LED_RSSI_MED 12
 #define ALL0256N_GPIO_LED_RSSI_HIGH 13
-#define ALL0256N_BUTTONS_POLL_INTERVAL 20
+#define ALL0256N_KEYS_POLL_INTERVAL 20
+#define ALL0256N_KEYS_DEBOUNCE_INTERVAL	(3 * ALL0256N_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition all0256n_partitions[] = {
 	{
@@ -76,12 +77,12 @@ struct spi_board_info all0256n_spi_slave_info[] __initdata = {
 	},
 };
 
-static struct gpio_button all0256n_gpio_buttons[] __initdata = {
+static struct gpio_keys_button all0256n_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = ALL0256N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= ALL0256N_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	}
@@ -112,7 +113,7 @@ static void __init all0256n_init(void)
 	rt305x_register_ethernet();
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(all0256n_leds_gpio),
 				  all0256n_leds_gpio);
-	ramips_register_gpio_buttons(-1, ALL0256N_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, ALL0256N_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(all0256n_gpio_buttons),
 				     all0256n_gpio_buttons);
 	rt305x_register_wifi();