diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-11 19:37:06 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-11 19:37:06 +0000 |
| commit | 0e7a5607b4b069135197fd92b80c42d0e946288e (patch) | |
| tree | 147c75003956329106f56ca700231e0c1a4d5379 /target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c | |
| parent | c92c2b1cee918a3b92c91b41a0ca32b7ed69172d (diff) | |
| download | master-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-dir-300-revb.c')
| -rw-r--r-- | target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c index 70a2245b8d..b84d9ed9f4 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c @@ -29,7 +29,8 @@ #define DIR_300B_GPIO_BUTTON_WPS 0 /* active low */ #define DIR_300B_GPIO_BUTTON_RESET 10 /* active low */ -#define DIR_300B_BUTTONS_POLL_INTERVAL 20 +#define DIR_300B_KEYS_POLL_INTERVAL 20 +#define DIR_300B_KEYS_DEBOUNCE_INTERVAL (3 * DIR_300B_KEYS_POLL_INTERVAL) static struct mtd_partition dir_300b_partitions[] = { { @@ -83,19 +84,19 @@ static struct gpio_led dir_300b_leds_gpio[] __initdata = { } }; -static struct gpio_button dir_300b_gpio_buttons[] __initdata = { +static struct gpio_keys_button dir_300b_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, .code = KEY_RESTART, - .threshold = 3, + .debounce_interval = DIR_300B_KEYS_DEBOUNCE_INTERVAL, .gpio = DIR_300B_GPIO_BUTTON_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, .code = KEY_WPS_BUTTON, - .threshold = 3, + .debounce_interval = DIR_300B_KEYS_DEBOUNCE_INTERVAL, .gpio = DIR_300B_GPIO_BUTTON_WPS, .active_low = 1, } @@ -110,7 +111,7 @@ static void __init dir_300b_init(void) rt305x_register_ethernet(); ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio), dir_300b_leds_gpio); - ramips_register_gpio_buttons(-1, DIR_300B_BUTTONS_POLL_INTERVAL, + ramips_register_gpio_buttons(-1, DIR_300B_KEYS_POLL_INTERVAL, ARRAY_SIZE(dir_300b_gpio_buttons), dir_300b_gpio_buttons); rt305x_register_wifi(); |