Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[deliverable/linux.git] / drivers / input / keyboard / gpio_keys.c

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index fa03a00b4c6df8948e8d6eba0033cf58bf360ba8..e2a3293bc67ed37b66949747de99d0e3d4d1dfd9 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -22,12 +22,9 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/irq.h>
+#include <linux/gpio_keys.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/hardware.h>
-
-#include <asm/hardware/gpio_keys.h>
 
 static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
 {
@@ -37,11 +34,14 @@ static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
        struct input_dev *input = platform_get_drvdata(pdev);
 
        for (i = 0; i < pdata->nbuttons; i++) {
-               int gpio = pdata->buttons[i].gpio;
+               struct gpio_keys_button *button = &pdata->buttons[i];
+               int gpio = button->gpio;
+
                if (irq == gpio_to_irq(gpio)) {
-                       int state = (gpio_get_value(gpio) ? 1 : 0) ^ (pdata->buttons[i].active_low);
+                       unsigned int type = button->type ?: EV_KEY;
+                       int state = (gpio_get_value(gpio) ? 1 : 0) ^ button->active_low;
 
-                       input_report_key(input, pdata->buttons[i].keycode, state);
+                       input_event(input, type, button->code, !!state);
                        input_sync(input);
                }
        }
@@ -54,6 +54,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
        struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
        struct input_dev *input;
        int i, error;
+       int wakeup = 0;
 
        input = input_allocate_device();
        if (!input)
@@ -65,8 +66,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 
        input->name = pdev->name;
        input->phys = "gpio-keys/input0";
-       input->cdev.dev = &pdev->dev;
-       input->private = pdata;
+       input->dev.parent = &pdev->dev;
 
        input->id.bustype = BUS_HOST;
        input->id.vendor = 0x0001;
@@ -74,33 +74,55 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
        input->id.version = 0x0100;
 
        for (i = 0; i < pdata->nbuttons; i++) {
-               int code = pdata->buttons[i].keycode;
-               int irq = gpio_to_irq(pdata->buttons[i].gpio);
+               struct gpio_keys_button *button = &pdata->buttons[i];
+               int irq = gpio_to_irq(button->gpio);
+               unsigned int type = button->type ?: EV_KEY;
+
+               if (irq < 0) {
+                       error = irq;
+                       printk(KERN_ERR
+                               "gpio-keys: "
+                               "Unable to get irq number for GPIO %d,"
+                               "error %d\n",
+                               button->gpio, error);
+                       goto fail;
+               }
 
-               set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
-               error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
-                                    pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys",
-                                    pdev);
+               error = request_irq(irq, gpio_keys_isr,
+                                   IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_RISING |
+                                       IRQF_TRIGGER_FALLING,
+                                   button->desc ? button->desc : "gpio_keys",
+                                   pdev);
                if (error) {
-                       printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n",
+                       printk(KERN_ERR
+                               "gpio-keys: Unable to claim irq %d; error %d\n",
                                irq, error);
                        goto fail;
                }
-               set_bit(code, input->keybit);
+
+               if (button->wakeup)
+                       wakeup = 1;
+
+               input_set_capability(input, type, button->code);
        }
 
        error = input_register_device(input);
        if (error) {
-               printk(KERN_ERR "Unable to register gpio-keys input device\n");
+               printk(KERN_ERR
+                       "gpio-keys: Unable to register input device, "
+                       "error: %d\n", error);
                goto fail;
        }
 
+       device_init_wakeup(&pdev->dev, wakeup);
+
        return 0;
 
  fail:
-       for (i = i - 1; i >= 0; i--)
+       while (--i >= 0)
                free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev);
 
+       platform_set_drvdata(pdev, NULL);
        input_free_device(input);
 
        return error;
@@ -112,6 +134,8 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
        struct input_dev *input = platform_get_drvdata(pdev);
        int i;
 
+       device_init_wakeup(&pdev->dev, 0);
+
        for (i = 0; i < pdata->nbuttons; i++) {
                int irq = gpio_to_irq(pdata->buttons[i].gpio);
                free_irq(irq, pdev);
@@ -122,9 +146,53 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
        return 0;
 }
 
+
+#ifdef CONFIG_PM
+static int gpio_keys_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
+       int i;
+
+       if (device_may_wakeup(&pdev->dev)) {
+               for (i = 0; i < pdata->nbuttons; i++) {
+                       struct gpio_keys_button *button = &pdata->buttons[i];
+                       if (button->wakeup) {
+                               int irq = gpio_to_irq(button->gpio);
+                               enable_irq_wake(irq);
+                       }
+               }
+       }
+
+       return 0;
+}
+
+static int gpio_keys_resume(struct platform_device *pdev)
+{
+       struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
+       int i;
+
+       if (device_may_wakeup(&pdev->dev)) {
+               for (i = 0; i < pdata->nbuttons; i++) {
+                       struct gpio_keys_button *button = &pdata->buttons[i];
+                       if (button->wakeup) {
+                               int irq = gpio_to_irq(button->gpio);
+                               disable_irq_wake(irq);
+                       }
+               }
+       }
+
+       return 0;
+}
+#else
+#define gpio_keys_suspend      NULL
+#define gpio_keys_resume       NULL
+#endif
+
 struct platform_driver gpio_keys_device_driver = {
        .probe          = gpio_keys_probe,
        .remove         = __devexit_p(gpio_keys_remove),
+       .suspend        = gpio_keys_suspend,
+       .resume         = gpio_keys_resume,
        .driver         = {
                .name   = "gpio-keys",
        }