Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / gpio_keys_polled.c
index 21147164874d8592227d92a96a5c97f59e217ca5..62bdb1d48c49dbd990ce37f2da335ee8d60b472d 100644 (file)
 
 #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/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/gpio_keys.h>
-#include <linux/of_platform.h>
-#include <linux/of_gpio.h>
+#include <linux/property.h>
 
 #define DRV_NAME       "gpio-keys-polled"
 
@@ -41,26 +40,49 @@ struct gpio_keys_polled_dev {
        struct input_polled_dev *poll_dev;
        struct device *dev;
        const struct gpio_keys_platform_data *pdata;
+       unsigned long rel_axis_seen[BITS_TO_LONGS(REL_CNT)];
+       unsigned long abs_axis_seen[BITS_TO_LONGS(ABS_CNT)];
        struct gpio_keys_button_data data[0];
 };
 
-static void gpio_keys_polled_check_state(struct input_dev *input,
+static void gpio_keys_button_event(struct input_polled_dev *dev,
+                                  struct gpio_keys_button *button,
+                                  int state)
+{
+       struct gpio_keys_polled_dev *bdev = dev->private;
+       struct input_dev *input = dev->input;
+       unsigned int type = button->type ?: EV_KEY;
+
+       if (type == EV_REL) {
+               if (state) {
+                       input_event(input, type, button->code, button->value);
+                       __set_bit(button->code, bdev->rel_axis_seen);
+               }
+       } else if (type == EV_ABS) {
+               if (state) {
+                       input_event(input, type, button->code, button->value);
+                       __set_bit(button->code, bdev->abs_axis_seen);
+               }
+       } else {
+               input_event(input, type, button->code, state);
+               input_sync(input);
+       }
+}
+
+static void gpio_keys_polled_check_state(struct input_polled_dev *dev,
                                         struct gpio_keys_button *button,
                                         struct gpio_keys_button_data *bdata)
 {
        int state;
 
        if (bdata->can_sleep)
-               state = !!gpio_get_value_cansleep(button->gpio);
+               state = !!gpiod_get_value_cansleep(button->gpiod);
        else
-               state = !!gpio_get_value(button->gpio);
+               state = !!gpiod_get_value(button->gpiod);
 
-       if (state != bdata->last_state) {
-               unsigned int type = button->type ?: EV_KEY;
+       gpio_keys_button_event(dev, button, state);
 
-               input_event(input, type, button->code,
-                           !!(state ^ button->active_low));
-               input_sync(input);
+       if (state != bdata->last_state) {
                bdata->count = 0;
                bdata->last_state = state;
        }
@@ -73,15 +95,33 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
        struct input_dev *input = dev->input;
        int i;
 
+       memset(bdev->rel_axis_seen, 0, sizeof(bdev->rel_axis_seen));
+       memset(bdev->abs_axis_seen, 0, sizeof(bdev->abs_axis_seen));
+
        for (i = 0; i < pdata->nbuttons; i++) {
                struct gpio_keys_button_data *bdata = &bdev->data[i];
 
-               if (bdata->count < bdata->threshold)
+               if (bdata->count < bdata->threshold) {
                        bdata->count++;
-               else
-                       gpio_keys_polled_check_state(input, &pdata->buttons[i],
+                       gpio_keys_button_event(dev, &pdata->buttons[i],
+                                              bdata->last_state);
+               } else {
+                       gpio_keys_polled_check_state(dev, &pdata->buttons[i],
                                                     bdata);
+               }
        }
+
+       for_each_set_bit(i, input->relbit, REL_CNT) {
+               if (!test_bit(i, bdev->rel_axis_seen))
+                       input_event(input, EV_REL, i, 0);
+       }
+
+       for_each_set_bit(i, input->absbit, ABS_CNT) {
+               if (!test_bit(i, bdev->abs_axis_seen))
+                       input_event(input, EV_ABS, i, 0);
+       }
+
+       input_sync(input);
 }
 
 static void gpio_keys_polled_open(struct input_polled_dev *dev)
@@ -102,110 +142,103 @@ static void gpio_keys_polled_close(struct input_polled_dev *dev)
                pdata->disable(bdev->dev);
 }
 
-#ifdef CONFIG_OF
 static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct device *dev)
 {
-       struct device_node *node, *pp;
        struct gpio_keys_platform_data *pdata;
        struct gpio_keys_button *button;
+       struct fwnode_handle *child;
        int error;
        int nbuttons;
-       int i;
-
-       node = dev->of_node;
-       if (!node)
-               return NULL;
 
-       nbuttons = of_get_child_count(node);
+       nbuttons = device_get_child_node_count(dev);
        if (nbuttons == 0)
                return NULL;
 
-       pdata = kzalloc(sizeof(*pdata) + nbuttons * (sizeof *button),
-                       GFP_KERNEL);
-       if (!pdata) {
-               error = -ENOMEM;
-               goto err_out;
-       }
+       pdata = devm_kzalloc(dev, sizeof(*pdata) + nbuttons * sizeof(*button),
+                            GFP_KERNEL);
+       if (!pdata)
+               return ERR_PTR(-ENOMEM);
 
        pdata->buttons = (struct gpio_keys_button *)(pdata + 1);
-       pdata->nbuttons = nbuttons;
 
-       pdata->rep = !!of_get_property(node, "autorepeat", NULL);
-       of_property_read_u32(node, "poll-interval", &pdata->poll_interval);
+       pdata->rep = device_property_present(dev, "autorepeat");
+       device_property_read_u32(dev, "poll-interval", &pdata->poll_interval);
 
-       i = 0;
-       for_each_child_of_node(node, pp) {
-               int gpio;
-               enum of_gpio_flags flags;
-
-               if (!of_find_property(pp, "gpios", NULL)) {
-                       pdata->nbuttons--;
-                       dev_warn(dev, "Found button without gpios\n");
-                       continue;
-               }
+       device_for_each_child_node(dev, child) {
+               struct gpio_desc *desc;
 
-               gpio = of_get_gpio_flags(pp, 0, &flags);
-               if (gpio < 0) {
-                       error = gpio;
+               desc = devm_get_gpiod_from_child(dev, NULL, child);
+               if (IS_ERR(desc)) {
+                       error = PTR_ERR(desc);
                        if (error != -EPROBE_DEFER)
                                dev_err(dev,
                                        "Failed to get gpio flags, error: %d\n",
                                        error);
-                       goto err_free_pdata;
+                       fwnode_handle_put(child);
+                       return ERR_PTR(error);
                }
 
-               button = &pdata->buttons[i++];
-
-               button->gpio = gpio;
-               button->active_low = flags & OF_GPIO_ACTIVE_LOW;
+               button = &pdata->buttons[pdata->nbuttons++];
+               button->gpiod = desc;
 
-               if (of_property_read_u32(pp, "linux,code", &button->code)) {
-                       dev_err(dev, "Button without keycode: 0x%x\n",
-                               button->gpio);
-                       error = -EINVAL;
-                       goto err_free_pdata;
+               if (fwnode_property_read_u32(child, "linux,code", &button->code)) {
+                       dev_err(dev, "Button without keycode: %d\n",
+                               pdata->nbuttons - 1);
+                       fwnode_handle_put(child);
+                       return ERR_PTR(-EINVAL);
                }
 
-               button->desc = of_get_property(pp, "label", NULL);
+               fwnode_property_read_string(child, "label", &button->desc);
 
-               if (of_property_read_u32(pp, "linux,input-type", &button->type))
+               if (fwnode_property_read_u32(child, "linux,input-type",
+                                            &button->type))
                        button->type = EV_KEY;
 
-               button->wakeup = !!of_get_property(pp, "gpio-key,wakeup", NULL);
+               if (fwnode_property_read_u32(child, "linux,input-value",
+                                            (u32 *)&button->value))
+                       button->value = 1;
 
-               if (of_property_read_u32(pp, "debounce-interval",
-                                        &button->debounce_interval))
+               button->wakeup =
+                       fwnode_property_read_bool(child, "wakeup-source") ||
+                       /* legacy name */
+                       fwnode_property_read_bool(child, "gpio-key,wakeup");
+
+               if (fwnode_property_read_u32(child, "debounce-interval",
+                                            &button->debounce_interval))
                        button->debounce_interval = 5;
        }
 
-       if (pdata->nbuttons == 0) {
-               error = -EINVAL;
-               goto err_free_pdata;
-       }
+       if (pdata->nbuttons == 0)
+               return ERR_PTR(-EINVAL);
 
        return pdata;
+}
+
+static void gpio_keys_polled_set_abs_params(struct input_dev *input,
+       const struct gpio_keys_platform_data *pdata, unsigned int code)
+{
+       int i, min = 0, max = 0;
+
+       for (i = 0; i < pdata->nbuttons; i++) {
+               struct gpio_keys_button *button = &pdata->buttons[i];
+
+               if (button->type != EV_ABS || button->code != code)
+                       continue;
 
-err_free_pdata:
-       kfree(pdata);
-err_out:
-       return ERR_PTR(error);
+               if (button->value < min)
+                       min = button->value;
+               if (button->value > max)
+                       max = button->value;
+       }
+       input_set_abs_params(input, code, min, max, 0, 0);
 }
 
-static struct of_device_id gpio_keys_polled_of_match[] = {
+static const struct of_device_id gpio_keys_polled_of_match[] = {
        { .compatible = "gpio-keys-polled", },
        { },
 };
 MODULE_DEVICE_TABLE(of, gpio_keys_polled_of_match);
 
-#else
-
-static inline struct gpio_keys_platform_data *
-gpio_keys_polled_get_devtree_pdata(struct device *dev)
-{
-       return NULL;
-}
-#endif
-
 static int gpio_keys_polled_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -213,6 +246,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        struct gpio_keys_polled_dev *bdev;
        struct input_polled_dev *poll_dev;
        struct input_dev *input;
+       size_t size;
        int error;
        int i;
 
@@ -228,24 +262,21 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        if (!pdata->poll_interval) {
                dev_err(dev, "missing poll_interval value\n");
-               error = -EINVAL;
-               goto err_free_pdata;
+               return -EINVAL;
        }
 
-       bdev = kzalloc(sizeof(struct gpio_keys_polled_dev) +
-                      pdata->nbuttons * sizeof(struct gpio_keys_button_data),
-                      GFP_KERNEL);
+       size = sizeof(struct gpio_keys_polled_dev) +
+                       pdata->nbuttons * sizeof(struct gpio_keys_button_data);
+       bdev = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
        if (!bdev) {
                dev_err(dev, "no memory for private data\n");
-               error = -ENOMEM;
-               goto err_free_pdata;
+               return -ENOMEM;
        }
 
-       poll_dev = input_allocate_polled_device();
+       poll_dev = devm_input_allocate_polled_device(&pdev->dev);
        if (!poll_dev) {
                dev_err(dev, "no memory for polled device\n");
-               error = -ENOMEM;
-               goto err_free_bdev;
+               return -ENOMEM;
        }
 
        poll_dev->private = bdev;
@@ -258,7 +289,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        input->name = pdev->name;
        input->phys = DRV_NAME"/input0";
-       input->dev.parent = &pdev->dev;
 
        input->id.bustype = BUS_HOST;
        input->id.vendor = 0x0001;
@@ -272,29 +302,46 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        for (i = 0; i < pdata->nbuttons; i++) {
                struct gpio_keys_button *button = &pdata->buttons[i];
                struct gpio_keys_button_data *bdata = &bdev->data[i];
-               unsigned int gpio = button->gpio;
                unsigned int type = button->type ?: EV_KEY;
 
                if (button->wakeup) {
                        dev_err(dev, DRV_NAME " does not support wakeup\n");
-                       error = -EINVAL;
-                       goto err_free_gpio;
+                       return -EINVAL;
                }
 
-               error = gpio_request_one(gpio, GPIOF_IN,
-                                        button->desc ?: DRV_NAME);
-               if (error) {
-                       dev_err(dev, "unable to claim gpio %u, err=%d\n",
-                               gpio, error);
-                       goto err_free_gpio;
+               /*
+                * Legacy GPIO number so request the GPIO here and
+                * convert it to descriptor.
+                */
+               if (!button->gpiod && gpio_is_valid(button->gpio)) {
+                       unsigned flags = GPIOF_IN;
+
+                       if (button->active_low)
+                               flags |= GPIOF_ACTIVE_LOW;
+
+                       error = devm_gpio_request_one(&pdev->dev, button->gpio,
+                                       flags, button->desc ? : DRV_NAME);
+                       if (error) {
+                               dev_err(dev, "unable to claim gpio %u, err=%d\n",
+                                       button->gpio, error);
+                               return error;
+                       }
+
+                       button->gpiod = gpio_to_desc(button->gpio);
                }
 
-               bdata->can_sleep = gpio_cansleep(gpio);
+               if (IS_ERR(button->gpiod))
+                       return PTR_ERR(button->gpiod);
+
+               bdata->can_sleep = gpiod_cansleep(button->gpiod);
                bdata->last_state = -1;
                bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
                                                pdata->poll_interval);
 
                input_set_capability(input, type, button->code);
+               if (type == EV_ABS)
+                       gpio_keys_polled_set_abs_params(input, pdata,
+                                                       button->code);
        }
 
        bdev->poll_dev = poll_dev;
@@ -306,67 +353,24 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        if (error) {
                dev_err(dev, "unable to register polled device, err=%d\n",
                        error);
-               goto err_free_gpio;
+               return error;
        }
 
        /* report initial state of the buttons */
        for (i = 0; i < pdata->nbuttons; i++)
-               gpio_keys_polled_check_state(input, &pdata->buttons[i],
+               gpio_keys_polled_check_state(poll_dev, &pdata->buttons[i],
                                             &bdev->data[i]);
 
-       return 0;
-
-err_free_gpio:
-       while (--i >= 0)
-               gpio_free(pdata->buttons[i].gpio);
-
-       input_free_polled_device(poll_dev);
-
-err_free_bdev:
-       kfree(bdev);
-       platform_set_drvdata(pdev, NULL);
-
-err_free_pdata:
-       /* If we have no platform_data, we allocated pdata dynamically.  */
-       if (!dev_get_platdata(&pdev->dev))
-               kfree(pdata);
-
-       return error;
-}
-
-static int gpio_keys_polled_remove(struct platform_device *pdev)
-{
-       struct gpio_keys_polled_dev *bdev = platform_get_drvdata(pdev);
-       const struct gpio_keys_platform_data *pdata = bdev->pdata;
-       int i;
-
-       input_unregister_polled_device(bdev->poll_dev);
-
-       for (i = 0; i < pdata->nbuttons; i++)
-               gpio_free(pdata->buttons[i].gpio);
-
-       input_free_polled_device(bdev->poll_dev);
-
-       /*
-        * If we had no platform_data, we allocated pdata dynamically and
-        * must free it here.
-        */
-       if (!dev_get_platdata(&pdev->dev))
-               kfree(pdata);
-
-       kfree(bdev);
-       platform_set_drvdata(pdev, NULL);
+       input_sync(input);
 
        return 0;
 }
 
 static struct platform_driver gpio_keys_polled_driver = {
        .probe  = gpio_keys_polled_probe,
-       .remove = gpio_keys_polled_remove,
        .driver = {
                .name   = DRV_NAME,
-               .owner  = THIS_MODULE,
-               .of_match_table = of_match_ptr(gpio_keys_polled_of_match),
+               .of_match_table = gpio_keys_polled_of_match,
        },
 };
 module_platform_driver(gpio_keys_polled_driver);