projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ramips: use gpio-keys-polled instead of gpio-buttons
[openwrt.git]
/
target
/
linux
/
ramips
/
files
/
arch
/
mips
/
ralink
/
rt305x
/
mach-dir-300-revb.c
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
6228036
..
b84d9ed
100644
(file)
--- 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,9
+29,9
@@
#define DIR_300B_GPIO_BUTTON_WPS 0 /* active low */
#define DIR_300B_GPIO_BUTTON_RESET 10 /* active low */
#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)
-#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition dir_300b_partitions[] = {
{
.name = "u-boot",
static struct mtd_partition dir_300b_partitions[] = {
{
.name = "u-boot",
@@
-62,13
+62,10
@@
static struct mtd_partition dir_300b_partitions[] = {
.size = 0x3b0000,
}
};
.size = 0x3b0000,
}
};
-#endif /* CONFIG_MTD_PARTITIONS */
static struct physmap_flash_data dir_300b_flash_data = {
static struct physmap_flash_data dir_300b_flash_data = {
-#ifdef CONFIG_MTD_PARTITIONS
.nr_parts = ARRAY_SIZE(dir_300b_partitions),
.parts = dir_300b_partitions,
.nr_parts = ARRAY_SIZE(dir_300b_partitions),
.parts = dir_300b_partitions,
-#endif
};
static struct gpio_led dir_300b_leds_gpio[] __initdata = {
};
static struct gpio_led dir_300b_leds_gpio[] __initdata = {
@@
-87,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,
{
.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,
.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,
}
.gpio = DIR_300B_GPIO_BUTTON_WPS,
.active_low = 1,
}
@@
-114,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);
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_
BUTTON
S_POLL_INTERVAL,
+ ramips_register_gpio_buttons(-1, DIR_300B_
KEY
S_POLL_INTERVAL,
ARRAY_SIZE(dir_300b_gpio_buttons),
dir_300b_gpio_buttons);
rt305x_register_wifi();
ARRAY_SIZE(dir_300b_gpio_buttons),
dir_300b_gpio_buttons);
rt305x_register_wifi();
This page took
0.060815 seconds
and
4
git commands to generate.