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

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

3 files changed, 19 insertions, 16 deletions

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
index 71c84c146..850dc4bd7 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-f5d8235-v1.c
@@ -35,7 +35,8 @@
 #define F5D8235_GPIO_BUTTON_WPS		0
 #define F5D8235_GPIO_BUTTON_RESET	9
 
-#define F5D8235_BUTTONS_POLL_INTERVAL	20
+#define F5D8235_KEYS_POLL_INTERVAL	20
+#define F5D8235_KEYS_DEBOUNCE_INTERVAL	(3 * F5D8235_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition f5d8235_partitions[] = {
 	{
@@ -92,19 +93,19 @@ static struct gpio_led f5d8235_leds_gpio[] __initdata = {
 	}
 };
 
-static struct gpio_button f5d8235_gpio_buttons[] __initdata = {
+static struct gpio_keys_button f5d8235_gpio_buttons[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = F5D8235_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= F5D8235_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = F5D8235_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= F5D8235_GPIO_BUTTON_WPS,
 		.active_low	= 1,
 	}
@@ -121,7 +122,7 @@ static void __init f5d8235_init(void)
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(f5d8235_leds_gpio),
 				  f5d8235_leds_gpio);
 
-	ramips_register_gpio_buttons(-1, F5D8235_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, F5D8235_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(f5d8235_gpio_buttons),
 				     f5d8235_gpio_buttons);
 
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 0818f2c23..dcffec000 100644
--- 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,7 +32,8 @@
 #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)
 
 static struct mtd_partition rt_n15_partitions[] = {
 	{
@@ -78,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,
-		.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,
-		.threshold	= 3,
+		.debounce_interval = RT_N15_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= RT_N15_GPIO_BUTTON_WPS,
 		.active_low	= 1,
 	}
@@ -118,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_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);
 
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
index 03c4adf31..a9f0de4d8 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-wli-tx4-ag300n.c
@@ -32,7 +32,8 @@
 #define WLI_TX4_AG300N_GPIO_BUTTON_BW_SWITCH	8
 #define WLI_TX4_AG300N_GPIO_BUTTON_RESET	9
 
-#define WLI_TX4_AG300N_BUTTONS_POLL_INTERVAL	20
+#define WLI_TX4_AG300N_KEYS_POLL_INTERVAL	20
+#define WLI_TX4_AG300N_KEYS_DEBOUNCE_INTERVAL	(3 * WLI_TX4_AG300N_KEYS_POLL_INTERVAL)
 
 static struct mtd_partition wli_tx4_ag300n_partitions[] = {
 	{
@@ -98,12 +99,12 @@ static struct gpio_led wli_tx4_ag300n_leds_gpio[] __initdata = {
 	},
 };
 
-static struct gpio_button wli_tx4_ag300n_gpio_buttons[] __initdata = {
+static struct gpio_keys_button wli_tx4_ag300n_gpio_buttons[] __initdata = {
 	{
 		.desc		= "Reset button",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = WLI_TX4_AG300N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= WLI_TX4_AG300N_GPIO_BUTTON_RESET,
 		.active_low	= 1,
 	},
@@ -111,7 +112,7 @@ static struct gpio_button wli_tx4_ag300n_gpio_buttons[] __initdata = {
 		.desc		= "AOSS button",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = WLI_TX4_AG300N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= WLI_TX4_AG300N_GPIO_BUTTON_AOSS,
 		.active_low	= 1,
 	},
@@ -119,7 +120,7 @@ static struct gpio_button wli_tx4_ag300n_gpio_buttons[] __initdata = {
 		.desc		= "Bandwidth switch",
 		.type		= EV_KEY,
 		.code		= BTN_0,
-		.threshold	= 3,
+		.debounce_interval = WLI_TX4_AG300N_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= WLI_TX4_AG300N_GPIO_BUTTON_BW_SWITCH,
 		.active_low	= 0,
 	},
@@ -131,7 +132,7 @@ static void __init wli_tx4_ag300n_init(void)
 
 	ramips_register_gpio_leds(-1, ARRAY_SIZE(wli_tx4_ag300n_leds_gpio),
 				  wli_tx4_ag300n_leds_gpio);
-	ramips_register_gpio_buttons(-1, WLI_TX4_AG300N_BUTTONS_POLL_INTERVAL,
+	ramips_register_gpio_buttons(-1, WLI_TX4_AG300N_KEYS_POLL_INTERVAL,
 				     ARRAY_SIZE(wli_tx4_ag300n_gpio_buttons),
 				     wli_tx4_ag300n_gpio_buttons);