only activate hw-debouncing on the inputs

[ms2-fixes] / debounce.c

diff --git a/debounce.c b/debounce.c
index d59f10af8f2a73c00b69329dc21738d6b123302c..5694d1286b780bd97005050e4f05eacff763933a 100644 (file)
--- a/debounce.c
+++ b/debounce.c
@@ -337,9 +337,6 @@ 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)
@@ -350,12 +347,11 @@ static void hw_debounce_pin(int gpio, int 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);
-       }
+       if (gpio_evmi == NULL)
+               return;
 
-       for (i = 0; i < (sizeof(mapphone_row_gpios) / sizeof(mapphone_row_gpios[0])); i++) {
-               hw_debounce_pin(mapphone_row_gpios[i], enable);
+       for (i = 0; i < gpio_evmi->ninputs; i++) {
+               hw_debounce_pin(gpio_evmi->input_gpios[i], enable);
        }
 }