ip17xx: Avoid auto-negotiation

[openwrt.git] / target / linux / generic-2.6 / files / drivers / input / misc / gpio_buttons.c

diff --git a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
index 83a8178..eb0e301 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
+++ b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
@@ -1,7 +1,8 @@
 /*
  *  Driver for buttons on GPIO lines not capable of generating interrupts
  *
 /*
  *  Driver for buttons on GPIO lines not capable of generating interrupts
  *

- *  Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2010 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2010 Nuno Goncalves <nunojpg@gmail.com>

  *
  *  This file was based on: /drivers/input/misc/cobalt_btns.c
  *     Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  This file was based on: /drivers/input/misc/cobalt_btns.c
  *     Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>


@@ -18,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

+#include <linux/slab.h>

 
 #include <linux/input.h>
 #include <linux/input-polldev.h>
 
 #include <linux/input.h>
 #include <linux/input-polldev.h>


@@ -29,12 +31,18 @@
 #include <asm/gpio.h>
 
 #define DRV_NAME       "gpio-buttons"
 #include <asm/gpio.h>
 
 #define DRV_NAME       "gpio-buttons"

-#define DRV_VERSION    "0.1.1"
+#define DRV_VERSION    "0.1.2"

 #define PFX            DRV_NAME ": "
 
 #define PFX            DRV_NAME ": "
 

+struct gpio_button_data {
+       int last_state;
+       int count;
+};
+

 struct gpio_buttons_dev {
        struct input_polled_dev *poll_dev;
        struct gpio_buttons_platform_data *pdata;
 struct gpio_buttons_dev {
        struct input_polled_dev *poll_dev;
        struct gpio_buttons_platform_data *pdata;

+       struct gpio_button_data *data;

 };
 
 static void gpio_buttons_poll(struct input_polled_dev *dev)
 };
 
 static void gpio_buttons_poll(struct input_polled_dev *dev)


@@ -49,22 +57,18 @@ static void gpio_buttons_poll(struct input_polled_dev *dev)
                unsigned int type = button->type ?: EV_KEY;
                int state;
 
                unsigned int type = button->type ?: EV_KEY;
                int state;
 

-               state = gpio_get_value(button->gpio) ? 1 : 0;
-               state ^= button->active_low;
-
-               if (state) {
-                       button->count++;
-               } else {
-                       if (button->count >= button->threshold) {
-                               input_event(input, type, button->code, 1);
-                               input_sync(input);
-                       }
-                       button->count = 0;
+               if (bdev->data[i].count < button->threshold) {
+                       bdev->data[i].count++;
+                       continue;

                }
 
                }
 

-               if (button->count == button->threshold) {
-                       input_event(input, type, button->code, 0);
+               state = gpio_get_value(button->gpio) ? 1 : 0;
+               if (state != bdev->data[i].last_state) {
+                       input_event(input, type, button->code,
+                                   !!(state ^ button->active_low));

                        input_sync(input);
                        input_sync(input);

+                       bdev->data[i].count = 0;
+                       bdev->data[i].last_state = state;

                }
        }
 }
                }
        }
 }


@@ -77,16 +81,19 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
        struct input_dev *input;
        int error, i;
 
        struct input_dev *input;
        int error, i;
 

-

        if (!pdata)
                return -ENXIO;
 
        if (!pdata)
                return -ENXIO;
 

-       bdev = kzalloc(sizeof(*bdev), GFP_KERNEL);
+       bdev = kzalloc(sizeof(struct gpio_buttons_dev) +
+                      sizeof(struct gpio_button_data) * pdata->nbuttons,
+                      GFP_KERNEL);

        if (!bdev) {
                printk(KERN_ERR DRV_NAME "no memory for device\n");
                return -ENOMEM;
        }
 
        if (!bdev) {
                printk(KERN_ERR DRV_NAME "no memory for device\n");
                return -ENOMEM;
        }
 

+       bdev->data = (struct gpio_button_data *) &bdev[1];
+

        poll_dev = input_allocate_polled_device();
        if (!poll_dev) {
                printk(KERN_ERR DRV_NAME "no memory for polled device\n");
        poll_dev = input_allocate_polled_device();
        if (!poll_dev) {
                printk(KERN_ERR DRV_NAME "no memory for polled device\n");


@@ -131,7 +138,7 @@ static int __devinit gpio_buttons_probe(struct platform_device *pdev)
                }
 
                input_set_capability(input, type, button->code);
                }
 
                input_set_capability(input, type, button->code);

-               button->count = 0;
+               bdev->data[i].last_state = gpio_get_value(button->gpio) ? 1 : 0;

        }
 
        bdev->poll_dev = poll_dev;
        }
 
        bdev->poll_dev = poll_dev;