2 files changed, 150 insertions, 67 deletions

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 8f44f7b8c944..62bfce468f9f 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -28,14 +28,18 @@
 #include <linux/gpio.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
+#include <linux/spinlock.h>
 
 struct gpio_button_data {
         const struct gpio_keys_button *button;
         struct input_dev *input;
         struct timer_list timer;
         struct work_struct work;
-        int timer_debounce;     /* in msecs */
+        unsigned int timer_debounce;    /* in msecs */
+        unsigned int irq;
+        spinlock_t lock;
         bool disabled;
+        bool key_pressed;
 };
 
 struct gpio_keys_drvdata {
@@ -114,7 +118,7 @@ static void gpio_keys_disable_button(struct gpio_button_data *bdata)
                 /*
                  * Disable IRQ and possible debouncing timer.
                  */
-                disable_irq(gpio_to_irq(bdata->button->gpio));
+                disable_irq(bdata->irq);
                 if (bdata->timer_debounce)
                         del_timer_sync(&bdata->timer);
 
@@ -135,7 +139,7 @@ static void gpio_keys_disable_button(struct gpio_button_data *bdata)
 static void gpio_keys_enable_button(struct gpio_button_data *bdata)
 {
         if (bdata->disabled) {
-                enable_irq(gpio_to_irq(bdata->button->gpio));
+                enable_irq(bdata->irq);
                 bdata->disabled = false;
         }
 }
@@ -320,7 +324,7 @@ static struct attribute_group gpio_keys_attr_group = {
         .attrs = gpio_keys_attrs,
 };
 
-static void gpio_keys_report_event(struct gpio_button_data *bdata)
+static void gpio_keys_gpio_report_event(struct gpio_button_data *bdata)
 {
         const struct gpio_keys_button *button = bdata->button;
         struct input_dev *input = bdata->input;
@@ -336,27 +340,26 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata)
         input_sync(input);
 }
 
-static void gpio_keys_work_func(struct work_struct *work)
+static void gpio_keys_gpio_work_func(struct work_struct *work)
 {
         struct gpio_button_data *bdata =
                 container_of(work, struct gpio_button_data, work);
 
-        gpio_keys_report_event(bdata);
+        gpio_keys_gpio_report_event(bdata);
 }
 
-static void gpio_keys_timer(unsigned long _data)
+static void gpio_keys_gpio_timer(unsigned long _data)
 {
-        struct gpio_button_data *data = (struct gpio_button_data *)_data;
+        struct gpio_button_data *bdata = (struct gpio_button_data *)_data;
 
-        schedule_work(&data->work);
+        schedule_work(&bdata->work);
 }
 
-static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
+static irqreturn_t gpio_keys_gpio_isr(int irq, void *dev_id)
 {
         struct gpio_button_data *bdata = dev_id;
-        const struct gpio_keys_button *button = bdata->button;
 
-        BUG_ON(irq != gpio_to_irq(button->gpio));
+        BUG_ON(irq != bdata->irq);
 
         if (bdata->timer_debounce)
                 mod_timer(&bdata->timer,
@@ -367,6 +370,53 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+static void gpio_keys_irq_timer(unsigned long _data)
+{
+        struct gpio_button_data *bdata = (struct gpio_button_data *)_data;
+        struct input_dev *input = bdata->input;
+        unsigned long flags;
+
+        spin_lock_irqsave(&bdata->lock, flags);
+        if (bdata->key_pressed) {
+                input_event(input, EV_KEY, bdata->button->code, 0);
+                input_sync(input);
+                bdata->key_pressed = false;
+        }
+        spin_unlock_irqrestore(&bdata->lock, flags);
+}
+
+static irqreturn_t gpio_keys_irq_isr(int irq, void *dev_id)
+{
+        struct gpio_button_data *bdata = dev_id;
+        const struct gpio_keys_button *button = bdata->button;
+        struct input_dev *input = bdata->input;
+        unsigned long flags;
+
+        BUG_ON(irq != bdata->irq);
+
+        spin_lock_irqsave(&bdata->lock, flags);
+
+        if (!bdata->key_pressed) {
+                input_event(input, EV_KEY, button->code, 1);
+                input_sync(input);
+
+                if (!bdata->timer_debounce) {
+                        input_event(input, EV_KEY, button->code, 0);
+                        input_sync(input);
+                        goto out;
+                }
+
+                bdata->key_pressed = true;
+        }
+
+        if (bdata->timer_debounce)
+                mod_timer(&bdata->timer,
+                        jiffies + msecs_to_jiffies(bdata->timer_debounce));
+out:
+        spin_unlock_irqrestore(&bdata->lock, flags);
+        return IRQ_HANDLED;
+}
+
 static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
                                          struct input_dev *input,
                                          struct gpio_button_data *bdata,
@@ -374,46 +424,79 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
 {
         const char *desc = button->desc ? button->desc : "gpio_keys";
         struct device *dev = &pdev->dev;
+        irq_handler_t isr;
         unsigned long irqflags;
         int irq, error;
 
-        setup_timer(&bdata->timer, gpio_keys_timer, (unsigned long)bdata);
-        INIT_WORK(&bdata->work, gpio_keys_work_func);
         bdata->input = input;
         bdata->button = button;
+        spin_lock_init(&bdata->lock);
 
-        error = gpio_request(button->gpio, desc);
-        if (error < 0) {
-                dev_err(dev, "failed to request GPIO %d, error %d\n",
-                        button->gpio, error);
-                goto fail2;
-        }
+        if (gpio_is_valid(button->gpio)) {
 
-        error = gpio_direction_input(button->gpio);
-        if (error < 0) {
-                dev_err(dev, "failed to configure"
+                error = gpio_request(button->gpio, desc);
+                if (error < 0) {
+                        dev_err(dev, "Failed to request GPIO %d, error %d\n",