diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-11 19:37:06 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-11 19:37:06 +0000 |
commit | d33e1ea7fdbff03a730162b0b830f147595bb390 (patch) | |
tree | 147c75003956329106f56ca700231e0c1a4d5379 /target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c | |
parent | 1e4941a025ba9490d841039a689ad1670f30111c (diff) |
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-argus-atp52b.c')
-rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c index d1c517029..00832f13b 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-argus-atp52b.c @@ -27,7 +27,8 @@ #define ARGUS_ATP52B_GPIO_LED_NET 13 #define ARGUS_ATP52B_GPIO_BUTTON_WPS 0 #define ARGUS_ATP52B_GPIO_BUTTON_RESET 10 -#define ARGUS_ATP52B_BUTTONS_POLL_INTERVAL 20 +#define ARGUS_ATP52B_KEYS_POLL_INTERVAL 20 +#define ARGUS_ATP52B_KEYS_DEBOUNCE_INTERVAL (3 * ARGUS_ATP52B_KEYS_POLL_INTERVAL) static struct gpio_led argus_atp52b_leds_gpio[] __initdata = { { @@ -42,12 +43,12 @@ static struct gpio_led argus_atp52b_leds_gpio[] __initdata = { } }; -static struct gpio_button argus_atp52b_gpio_buttons[] __initdata = { +static struct gpio_keys_button argus_atp52b_gpio_buttons[] __initdata = { { .desc = "wps", .type = EV_KEY, .code = KEY_WPS_BUTTON, - .threshold = 3, + .debounce_interval = ARGUS_ATP52B_KEYS_DEBOUNCE_INTERVAL, .gpio = ARGUS_ATP52B_GPIO_BUTTON_WPS, .active_low = 1, }, @@ -55,7 +56,7 @@ static struct gpio_button argus_atp52b_gpio_buttons[] __initdata = { .desc = "reset", .type = EV_KEY, .code = KEY_RESTART, - .threshold = 10, + .debounce_interval = ARGUS_ATP52B_KEYS_DEBOUNCE_INTERVAL, .gpio = ARGUS_ATP52B_GPIO_BUTTON_RESET, .active_low = 1, } @@ -99,7 +100,7 @@ static void __init argus_atp52b_init(void) rt305x_register_flash(0, &argus_atp52b_flash_data); ramips_register_gpio_leds(-1, ARRAY_SIZE(argus_atp52b_leds_gpio), argus_atp52b_leds_gpio); - ramips_register_gpio_buttons(-1, ARGUS_ATP52B_BUTTONS_POLL_INTERVAL, + ramips_register_gpio_buttons(-1, ARGUS_ATP52B_KEYS_POLL_INTERVAL, ARRAY_SIZE(argus_atp52b_gpio_buttons), argus_atp52b_gpio_buttons); rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL; |