aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-11 19:37:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-11 19:37:06 +0000
commit0e7a5607b4b069135197fd92b80c42d0e946288e (patch)
tree147c75003956329106f56ca700231e0c1a4d5379 /target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
parentc92c2b1cee918a3b92c91b41a0ca32b7ed69172d (diff)
downloadmaster-187ad058-0e7a5607b4b069135197fd92b80c42d0e946288e.tar.gz
master-187ad058-0e7a5607b4b069135197fd92b80c42d0e946288e.tar.bz2
master-187ad058-0e7a5607b4b069135197fd92b80c42d0e946288e.zip
ramips: use gpio-keys-polled instead of gpio-buttons
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30461 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c')
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
index 4eb1f4b99e..dc02f49638 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-pwh2004.c
@@ -25,7 +25,8 @@
#define PWH2004_GPIO_BUTTON_WPS 12
#define PWH2004_GPIO_LED_POWER 9
#define PWH2004_GPIO_LED_WIFI 14
-#define PWH2004_BUTTONS_POLL_INTERVAL 20
+#define PWH2004_KEYS_POLL_INTERVAL 20
+#define PWH2004_KEYS_DEBOUNCE_INTERVAL (3 * PWH2004_KEYS_POLL_INTERVAL)
static struct mtd_partition pwh2004_partitions[] = {
{
@@ -71,12 +72,12 @@ static struct gpio_led pwh2004_leds_gpio[] __initdata = {
}
};
-static struct gpio_button pwh2004_gpio_buttons[] __initdata = {
+static struct gpio_keys_button pwh2004_gpio_buttons[] __initdata = {
{
.desc = "wps",
.type = EV_KEY,
.code = KEY_RESTART,
- .threshold = 3,
+ .debounce_interval = PWH2004_KEYS_DEBOUNCE_INTERVAL,
.gpio = PWH2004_GPIO_BUTTON_WPS,
.active_low = 1,
}
@@ -88,7 +89,7 @@ static void __init pwh2004_init(void)
rt305x_register_flash(0, &pwh2004_flash_data);
ramips_register_gpio_leds(-1, ARRAY_SIZE(pwh2004_leds_gpio),
pwh2004_leds_gpio);
- ramips_register_gpio_buttons(-1, PWH2004_BUTTONS_POLL_INTERVAL,
+ ramips_register_gpio_buttons(-1, PWH2004_KEYS_POLL_INTERVAL,
ARRAY_SIZE(pwh2004_gpio_buttons),
pwh2004_gpio_buttons);
rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;