X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/f7cb07b26d83c0b24689f6efc65770e17b5dd2df..f556e8c9b3f5b6a124784412e238dd1ac02d226c:/debounce.c diff --git a/debounce.c b/debounce.c index cefa1d9..9511212 100644 --- a/debounce.c +++ b/debounce.c @@ -2,10 +2,12 @@ #include #include #include +#include -#define PREFIX "debounce: " +/* hardware debounce: (value + 1) * 31us */ +#define GPIO_DEBOUNCE_TIME 0x3 -static int debounce_delay = 15; +#define PREFIX "debounce: " static unsigned old_flags = 0; ktime_t old_debounce_delay; @@ -13,9 +15,6 @@ ktime_t old_settle_time; ktime_t old_poll_time; static struct gpio_event_matrix_info *gpio_evmi = NULL; -module_param(debounce_delay, int, S_IRUSR | S_IRGRP | S_IROTH); -MODULE_PARM_DESC(debounce_delay, "debouncing delay (ms), default: 15"); - static int find_ms2_dev(struct device *dev, void *data) { if (!strncmp((char*)data, dev_name(dev), strlen((char*)data))) { @@ -38,10 +37,10 @@ static void set_debounce_delay(long delay) if (gpio_evmi->debounce_delay.tv.nsec != delay * NSEC_PER_MSEC) { printk(KERN_INFO PREFIX "Changing debounce_delay\n"); gpio_evmi->debounce_delay.tv.nsec = delay * NSEC_PER_MSEC; - debounce_delay = delay; printk(KERN_INFO PREFIX "debounce_delay: %u\n", gpio_evmi->debounce_delay.tv.nsec); } +#if 0 if (gpio_evmi->debounce_delay.tv.nsec != 0) { if (!(gpio_evmi->flags & GPIOKPF_DEBOUNCE)) { printk(KERN_INFO PREFIX "Activating debounce\n"); @@ -53,6 +52,7 @@ static void set_debounce_delay(long delay) gpio_evmi->flags &= ~GPIOKPF_DEBOUNCE; } } +#endif } static ssize_t store_debounce_delay(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -65,7 +65,7 @@ static ssize_t store_debounce_delay(struct device *dev, struct device_attribute sscanf(buf, "%ld", &delay); set_debounce_delay(delay); - return strnlen(buf, PAGE_SIZE); + return count; } static ssize_t show_settle_time(struct device *dev, struct device_attribute *attr, char *buf) @@ -86,7 +86,7 @@ static ssize_t store_settle_time(struct device *dev, struct device_attribute *at sscanf(buf, "%ld", &delay); gpio_evmi->settle_time.tv.nsec = delay * NSEC_PER_USEC; - return strnlen(buf, PAGE_SIZE); + return count; } static ssize_t show_poll_time(struct device *dev, struct device_attribute *attr, char *buf) @@ -107,7 +107,7 @@ static ssize_t store_poll_time(struct device *dev, struct device_attribute *attr sscanf(buf, "%ld", &delay); gpio_evmi->poll_time.tv.nsec = delay * NSEC_PER_MSEC; - return strnlen(buf, PAGE_SIZE); + return count; } static ssize_t show_flags(struct device *dev, struct device_attribute *attr, char *buf) @@ -126,15 +126,207 @@ static ssize_t store_flags(struct device *dev, struct device_attribute *attr, co return -ENODEV; sscanf(buf, "0x%x", &flags); + + printk(KERN_INFO PREFIX "flags: 0x%x\n", flags); + gpio_evmi->flags = flags; - return strnlen(buf, PAGE_SIZE); + return count; +} + +static ssize_t show_debounce_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_DEBOUNCE) ? 1 : 0); +} + +static ssize_t store_debounce_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_DEBOUNCE; + } else { + gpio_evmi->flags &= ~GPIOKPF_DEBOUNCE; + } + + return count; +} + +static ssize_t show_remove_some_phantom_keys_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_REMOVE_SOME_PHANTOM_KEYS) ? 1 : 0); +} + +static ssize_t store_remove_some_phantom_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_REMOVE_SOME_PHANTOM_KEYS; + } else { + gpio_evmi->flags &= ~GPIOKPF_REMOVE_SOME_PHANTOM_KEYS; + } + + return count; +} + +static ssize_t show_print_unmapped_keys_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_UNMAPPED_KEYS) ? 1 : 0); +} + +static ssize_t store_print_unmapped_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_PRINT_UNMAPPED_KEYS; + } else { + gpio_evmi->flags &= ~GPIOKPF_PRINT_UNMAPPED_KEYS; + } + + return count; +} + +static ssize_t show_print_mapped_keys_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_MAPPED_KEYS) ? 1 : 0); +} + +static ssize_t store_print_mapped_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_PRINT_MAPPED_KEYS; + } else { + gpio_evmi->flags &= ~GPIOKPF_PRINT_MAPPED_KEYS; + } + + return count; +} + +static ssize_t show_print_phantom_keys_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_PRINT_PHANTOM_KEYS) ? 1 : 0); } -static DEVICE_ATTR(debounce_delay, (S_IRUGO | S_IWUGO), &show_debounce_delay, store_debounce_delay); -static DEVICE_ATTR(settle_time, (S_IRUGO | S_IWUGO), &show_settle_time, store_settle_time); -static DEVICE_ATTR(poll_time, (S_IRUGO | S_IWUGO), &show_poll_time, store_poll_time); -static DEVICE_ATTR(flags, (S_IRUGO | S_IWUGO), &show_flags, store_flags); +static ssize_t store_print_phantom_keys_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_PRINT_PHANTOM_KEYS; + } else { + gpio_evmi->flags &= ~GPIOKPF_PRINT_PHANTOM_KEYS; + } + + return count; +} + +static ssize_t show_active_high_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_ACTIVE_HIGH) ? 1 : 0); +} + +static ssize_t store_active_high_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_ACTIVE_HIGH; + } else { + gpio_evmi->flags &= ~GPIOKPF_ACTIVE_HIGH; + } + + return count; +} + +static ssize_t show_drive_inactive_flag(struct device *dev, struct device_attribute *attr, char *buf) +{ + if (!gpio_evmi) + return -ENODEV; + + return snprintf(buf, PAGE_SIZE, "%u\n", (gpio_evmi->flags & GPIOKPF_DRIVE_INACTIVE) ? 1 : 0); +} + +static ssize_t store_drive_inactive_flag(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + unsigned flag; + + if (!gpio_evmi) + return -ENODEV; + + sscanf(buf, "%u", &flag); + + if (flag) { + gpio_evmi->flags |= GPIOKPF_DRIVE_INACTIVE; + } else { + gpio_evmi->flags &= ~GPIOKPF_DRIVE_INACTIVE; + } + + return count; +} + +static DEVICE_ATTR(debounce_delay, (S_IRUGO | S_IWUGO), show_debounce_delay, store_debounce_delay); +static DEVICE_ATTR(settle_time, (S_IRUGO | S_IWUGO), show_settle_time, store_settle_time); +static DEVICE_ATTR(poll_time, (S_IRUGO | S_IWUGO), show_poll_time, store_poll_time); +static DEVICE_ATTR(flags, (S_IRUGO), show_flags, store_flags); +static DEVICE_ATTR(debounce_flag, (S_IRUGO | S_IWUGO), show_debounce_flag, store_debounce_flag); +static DEVICE_ATTR(remove_some_phantom_keys_flag, (S_IRUGO | S_IWUGO), show_remove_some_phantom_keys_flag, store_remove_some_phantom_keys_flag); +static DEVICE_ATTR(print_unmapped_keys_flag, (S_IRUGO | S_IWUGO), show_print_unmapped_keys_flag, store_print_unmapped_keys_flag); +static DEVICE_ATTR(print_mapped_keys_flag, (S_IRUGO | S_IWUGO), show_print_mapped_keys_flag, store_print_mapped_keys_flag); +static DEVICE_ATTR(print_phantom_keys_flag, (S_IRUGO | S_IWUGO), show_print_phantom_keys_flag, store_print_phantom_keys_flag); +static DEVICE_ATTR(active_high_flag, (S_IRUGO), show_active_high_flag, store_active_high_flag); +static DEVICE_ATTR(drive_inactive_flag, (S_IRUGO | S_IWUGO), show_drive_inactive_flag, store_drive_inactive_flag); static void debounce_release(struct device *dev) { @@ -145,6 +337,28 @@ static struct device debounce_device = { .release = debounce_release, }; +static unsigned int mapphone_col_gpios[] = { 43, 53, 54, 55, 56, 57, 58, 63 }; +static unsigned int mapphone_row_gpios[] = { 34, 35, 36, 37, 38, 39, 40, 41 }; + +static void hw_debounce_pin(int gpio, int enable) { + printk(KERN_INFO PREFIX "%sabling hardware debounce for GPIO %d\n", (enable?"En":"Dis"), gpio); + if (enable) + omap_set_gpio_debounce_time(gpio, GPIO_DEBOUNCE_TIME); + omap_set_gpio_debounce(gpio, enable); +} + +static void hw_debounce(int enable) { + int i; + + for (i = 0; i < (sizeof(mapphone_col_gpios) / sizeof(mapphone_col_gpios[0])); i++) { + hw_debounce_pin(mapphone_col_gpios[i], enable); + } + + for (i = 0; i < (sizeof(mapphone_row_gpios) / sizeof(mapphone_row_gpios[0])); i++) { + hw_debounce_pin(mapphone_row_gpios[i], enable); + } +} + static int __init debounce_init(void) { struct device *event_dev = NULL; @@ -171,10 +385,19 @@ static int __init debounce_init(void) return err; } + hw_debounce(1); + err = device_create_file(&debounce_device, &dev_attr_debounce_delay); err = device_create_file(&debounce_device, &dev_attr_settle_time); err = device_create_file(&debounce_device, &dev_attr_poll_time); err = device_create_file(&debounce_device, &dev_attr_flags); + err = device_create_file(&debounce_device, &dev_attr_debounce_flag); + err = device_create_file(&debounce_device, &dev_attr_remove_some_phantom_keys_flag); + err = device_create_file(&debounce_device, &dev_attr_print_unmapped_keys_flag); + err = device_create_file(&debounce_device, &dev_attr_print_mapped_keys_flag); + err = device_create_file(&debounce_device, &dev_attr_print_phantom_keys_flag); + err = device_create_file(&debounce_device, &dev_attr_active_high_flag); + err = device_create_file(&debounce_device, &dev_attr_drive_inactive_flag); printk(KERN_INFO PREFIX "settle_time: %u\n", gpio_evmi->settle_time.tv.nsec); printk(KERN_INFO PREFIX "poll_time: %u\n", gpio_evmi->poll_time.tv.nsec); @@ -186,10 +409,6 @@ static int __init debounce_init(void) old_poll_time = gpio_evmi->poll_time; old_flags = gpio_evmi->flags; - set_debounce_delay(debounce_delay); -#if 0 - gpio_evmi->flags &= ~GPIOKPF_REMOVE_SOME_PHANTOM_KEYS; -#endif printk(KERN_INFO PREFIX "flags: 0x%x\n", gpio_evmi->flags); return 0; @@ -211,10 +430,18 @@ static void __exit debounce_exit(void) gpio_evmi->settle_time = old_settle_time; gpio_evmi->poll_time = old_poll_time; } + hw_debounce(0); device_remove_file(&debounce_device, &dev_attr_debounce_delay); device_remove_file(&debounce_device, &dev_attr_settle_time); device_remove_file(&debounce_device, &dev_attr_poll_time); device_remove_file(&debounce_device, &dev_attr_flags); + device_remove_file(&debounce_device, &dev_attr_debounce_flag); + device_remove_file(&debounce_device, &dev_attr_remove_some_phantom_keys_flag); + device_remove_file(&debounce_device, &dev_attr_print_unmapped_keys_flag); + device_remove_file(&debounce_device, &dev_attr_print_mapped_keys_flag); + device_remove_file(&debounce_device, &dev_attr_print_phantom_keys_flag); + device_remove_file(&debounce_device, &dev_attr_active_high_flag); + device_remove_file(&debounce_device, &dev_attr_drive_inactive_flag); device_unregister(&debounce_device); }