Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-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 8f3a24e154027c1d2cdf92b0ec1f5d9932fd6497..d4dd78a7d56b5b1bf3dbe8865025bd5559a82ce2 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -29,6 +29,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
+#include <linux/of_irq.h>
 #include <linux/spinlock.h>
 
 struct gpio_button_data {
@@ -617,27 +618,31 @@ gpio_keys_get_devtree_pdata(struct device *dev)
 
        i = 0;
        for_each_child_of_node(node, pp) {
-               int gpio;
+               int gpio = -1;
                enum of_gpio_flags flags;
 
-               if (!of_find_property(pp, "gpios", NULL)) {
-                       pdata->nbuttons--;
-                       dev_warn(dev, "Found button without gpios\n");
-                       continue;
-               }
+               button = &pdata->buttons[i++];
 
-               gpio = of_get_gpio_flags(pp, 0, &flags);
-               if (gpio < 0) {
-                       error = gpio;
-                       if (error != -EPROBE_DEFER)
-                               dev_err(dev,
-                                       "Failed to get gpio flags, error: %d\n",
-                                       error);
-                       return ERR_PTR(error);
+               if (!of_find_property(pp, "gpios", NULL)) {
+                       button->irq = irq_of_parse_and_map(pp, 0);
+                       if (button->irq == 0) {
+                               i--;
+                               pdata->nbuttons--;
+                               dev_warn(dev, "Found button without gpios or irqs\n");
+                               continue;
+                       }
+               } else {
+                       gpio = of_get_gpio_flags(pp, 0, &flags);
+                       if (gpio < 0) {
+                               error = gpio;
+                               if (error != -EPROBE_DEFER)
+                                       dev_err(dev,
+                                               "Failed to get gpio flags, error: %d\n",
+                                               error);
+                               return ERR_PTR(error);
+                       }
                }
 
-               button = &pdata->buttons[i++];
-
                button->gpio = gpio;
                button->active_low = flags & OF_GPIO_ACTIVE_LOW;