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

[kvmfornfv.git] / kernel / drivers / input / touchscreen / of_touchscreen.c

diff --git a/kernel/drivers/input/touchscreen/of_touchscreen.c b/kernel/drivers/input/touchscreen/of_touchscreen.c
index b82b520..bb6f2fe 100644 (file)
--- a/kernel/drivers/input/touchscreen/of_touchscreen.c
+++ b/kernel/drivers/input/touchscreen/of_touchscreen.c
@@ -9,19 +9,27 @@
  *
  */
 
-#include <linux/of.h>
+#include <linux/property.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
 #include <linux/input/touchscreen.h>
 
-static u32 of_get_optional_u32(struct device_node *np,
-                              const char *property)
+static bool touchscreen_get_prop_u32(struct device *dev,
+                                    const char *property,
+                                    unsigned int default_value,
+                                    unsigned int *value)
 {
-       u32 val = 0;
+       u32 val;
+       int error;
 
-       of_property_read_u32(np, property, &val);
+       error = device_property_read_u32(dev, property, &val);
+       if (error) {
+               *value = default_value;
+               return false;
+       }
 
-       return val;
+       *value = val;
+       return true;
 }
 
 static void touchscreen_set_params(struct input_dev *dev,
@@ -31,13 +39,9 @@ static void touchscreen_set_params(struct input_dev *dev,
        struct input_absinfo *absinfo;
 
        if (!test_bit(axis, dev->absbit)) {
-               /*
-                * Emit a warning only if the axis is not a multitouch
-                * axis, which might not be set by the driver.
-                */
-               if (!input_is_mt_axis(axis))
-                       dev_warn(&dev->dev,
-                                "DT specifies parameters but the axis is not set up\n");
+               dev_warn(&dev->dev,
+                        "DT specifies parameters but the axis %lu is not set up\n",
+                        axis);
                return;
        }
 
@@ -47,41 +51,58 @@ static void touchscreen_set_params(struct input_dev *dev,
 }
 
 /**
- * touchscreen_parse_of_params - parse common touchscreen DT properties
- * @dev: device that should be parsed
+ * touchscreen_parse_properties - parse common touchscreen DT properties
+ * @input: input device that should be parsed
+ * @multitouch: specifies whether parsed properties should be applied to
+ *     single-touch or multi-touch axes
  *
  * This function parses common DT properties for touchscreens and setups the
- * input device accordingly. The function keeps previously setuped default
+ * input device accordingly. The function keeps previously set up default
  * values if no value is specified via DT.
  */
-void touchscreen_parse_of_params(struct input_dev *dev)
+void touchscreen_parse_properties(struct input_dev *input, bool multitouch)
 {
-       struct device_node *np = dev->dev.parent->of_node;
-       u32 maximum, fuzz;
+       struct device *dev = input->dev.parent;
+       unsigned int axis;
+       unsigned int maximum, fuzz;
+       bool data_present;
 
-       input_alloc_absinfo(dev);
-       if (!dev->absinfo)
+       input_alloc_absinfo(input);
+       if (!input->absinfo)
                return;
 
-       maximum = of_get_optional_u32(np, "touchscreen-size-x");
-       fuzz = of_get_optional_u32(np, "touchscreen-fuzz-x");
-       if (maximum || fuzz) {
-               touchscreen_set_params(dev, ABS_X, maximum, fuzz);
-               touchscreen_set_params(dev, ABS_MT_POSITION_X, maximum, fuzz);
-       }
+       axis = multitouch ? ABS_MT_POSITION_X : ABS_X;
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-x",
+                                               input_abs_get_max(input,
+                                                                 axis) + 1,
+                                               &maximum) |
+                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",
+                                               input_abs_get_fuzz(input, axis),
+                                               &fuzz);
+       if (data_present)
+               touchscreen_set_params(input, axis, maximum - 1, fuzz);
 
-       maximum = of_get_optional_u32(np, "touchscreen-size-y");
-       fuzz = of_get_optional_u32(np, "touchscreen-fuzz-y");
-       if (maximum || fuzz) {
-               touchscreen_set_params(dev, ABS_Y, maximum, fuzz);
-               touchscreen_set_params(dev, ABS_MT_POSITION_Y, maximum, fuzz);
-       }
+       axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-y",
+                                               input_abs_get_max(input,
+                                                                 axis) + 1,
+                                               &maximum) |
+                      touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",
+                                               input_abs_get_fuzz(input, axis),
+                                               &fuzz);
+       if (data_present)
+               touchscreen_set_params(input, axis, maximum - 1, fuzz);
 
-       maximum = of_get_optional_u32(np, "touchscreen-max-pressure");
-       fuzz = of_get_optional_u32(np, "touchscreen-fuzz-pressure");
-       if (maximum || fuzz) {
-               touchscreen_set_params(dev, ABS_PRESSURE, maximum, fuzz);
-               touchscreen_set_params(dev, ABS_MT_PRESSURE, maximum, fuzz);
-       }
+       axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE;
+       data_present = touchscreen_get_prop_u32(dev,
+                                               "touchscreen-max-pressure",
+                                               input_abs_get_max(input, axis),
+                                               &maximum) |
+                      touchscreen_get_prop_u32(dev,
+                                               "touchscreen-fuzz-pressure",
+                                               input_abs_get_fuzz(input, axis),
+                                               &fuzz);
+       if (data_present)
+               touchscreen_set_params(input, axis, maximum, fuzz);
 }
-EXPORT_SYMBOL(touchscreen_parse_of_params);
+EXPORT_SYMBOL(touchscreen_parse_properties);