These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / keyboard / gpio_keys_polled.c

diff --git a/kernel/drivers/input/keyboard/gpio_keys_polled.c b/kernel/drivers/input/keyboard/gpio_keys_polled.c
index c6dc644..62bdb1d 100644 (file)
--- a/kernel/drivers/input/keyboard/gpio_keys_polled.c
+++ b/kernel/drivers/input/keyboard/gpio_keys_polled.c
@@ -40,10 +40,36 @@ 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)
 {
@@ -54,11 +80,9 @@ static void gpio_keys_polled_check_state(struct input_dev *input,
        else
                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);
-               input_sync(input);
+       if (state != bdata->last_state) {
                bdata->count = 0;
                bdata->last_state = state;
        }
@@ -71,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)
@@ -152,7 +194,14 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
                                             &button->type))
                        button->type = EV_KEY;
 
-               button->wakeup = fwnode_property_present(child, "gpio-key,wakeup");
+               if (fwnode_property_read_u32(child, "linux,input-value",
+                                            (u32 *)&button->value))
+                       button->value = 1;
+
+               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))
@@ -165,6 +214,25 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct
        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;
+
+               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 const struct of_device_id gpio_keys_polled_of_match[] = {
        { .compatible = "gpio-keys-polled", },
        { },
@@ -271,6 +339,9 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                                                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;
@@ -287,9 +358,11 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        /* 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]);
 
+       input_sync(input);
+
        return 0;
 }