| @@ -9,12 +9,12 @@ · 8 unmodified lines |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | | −#include <linux/of.h> |
| 12 | +#include <linux/property.h> |
| 13 | 13 | #include <linux/input.h> |
| 14 | 14 | #include <linux/input/mt.h> |
| 15 | 15 | #include <linux/input/touchscreen.h> |
| 16 | 16 | |
| 17 | | −static bool touchscreen_get_prop_u32(struct device_node *np, |
| 17 | +static bool touchscreen_get_prop_u32(struct device *dev, |
| 18 | 18 | const char *property, |
| 19 | 19 | unsigned int default_value, |
| 20 | 20 | unsigned int *value) |
| @@ -22,7 +22,7 @@ static bool touchscreen_get_prop_u32(struct device_node *np, · 1 unmodified line |
| 22 | 22 | u32 val; |
| 23 | 23 | int error; |
| 24 | 24 | |
| 25 | | − error = of_property_read_u32(np, property, &val); |
| 25 | + error = device_property_read_u32(dev, property, &val); |
| 26 | 26 | if (error) { |
| 27 | 27 | *value = default_value; |
| 28 | 28 | return false; |
| @@ -51,54 +51,58 @@ static void touchscreen_set_params(struct input_dev *dev, · 22 unmodified lines |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | | − * touchscreen_parse_of_params - parse common touchscreen DT properties |
| 55 | | − * @dev: device that should be parsed |
| 54 | + * touchscreen_parse_properties - parse common touchscreen DT properties |
| 55 | + * @input: input device that should be parsed |
| 56 | + * @multitouch: specifies whether parsed properties should be applied to |
| 57 | + * single-touch or multi-touch axes |
| 56 | 58 | * |
| 57 | 59 | * This function parses common DT properties for touchscreens and setups the |
| 58 | | − * input device accordingly. The function keeps previously setuped default |
| 60 | + * input device accordingly. The function keeps previously set up default |
| 59 | 61 | * values if no value is specified via DT. |
| 60 | 62 | */ |
| 61 | | −void touchscreen_parse_of_params(struct input_dev *dev, bool multitouch) |
| 63 | +void touchscreen_parse_properties(struct input_dev *input, bool multitouch) |
| 62 | 64 | { |
| 63 | | − struct device_node *np = dev->dev.parent->of_node; |
| 65 | + struct device *dev = input->dev.parent; |
| 64 | 66 | unsigned int axis; |
| 65 | 67 | unsigned int maximum, fuzz; |
| 66 | 68 | bool data_present; |
| 67 | 69 | |
| 68 | | − input_alloc_absinfo(dev); |
| 69 | | − if (!dev->absinfo) |
| 70 | + input_alloc_absinfo(input); |
| 71 | + if (!input->absinfo) |
| 70 | 72 | return; |
| 71 | 73 | |
| 72 | 74 | axis = multitouch ? ABS_MT_POSITION_X : ABS_X; |
| 73 | | − data_present = touchscreen_get_prop_u32(np, "touchscreen-size-x", |
| 74 | | − input_abs_get_max(dev, |
| 75 | + data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-x", |
| 76 | + input_abs_get_max(input, |
| 75 | 77 | axis) + 1, |
| 76 | 78 | &maximum) | |
| 77 | | − touchscreen_get_prop_u32(np, "touchscreen-fuzz-x", |
| 78 | | − input_abs_get_fuzz(dev, axis), |
| 79 | + touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", |
| 80 | + input_abs_get_fuzz(input, axis), |
| 79 | 81 | &fuzz); |
| 80 | 82 | if (data_present) |
| 81 | | − touchscreen_set_params(dev, axis, maximum - 1, fuzz); |
| 83 | + touchscreen_set_params(input, axis, maximum - 1, fuzz); |
| 82 | 84 | |
| 83 | 85 | axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y; |
| 84 | | − data_present = touchscreen_get_prop_u32(np, "touchscreen-size-y", |
| 85 | | − input_abs_get_max(dev, |
| 86 | + data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-y", |
| 87 | + input_abs_get_max(input, |
| 86 | 88 | axis) + 1, |
| 87 | 89 | &maximum) | |
| 88 | | − touchscreen_get_prop_u32(np, "touchscreen-fuzz-y", |
| 89 | | − input_abs_get_fuzz(dev, axis), |
| 90 | + touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", |
| 91 | + input_abs_get_fuzz(input, axis), |
| 90 | 92 | &fuzz); |
| 91 | 93 | if (data_present) |
| 92 | | − touchscreen_set_params(dev, axis, maximum - 1, fuzz); |
| 94 | + touchscreen_set_params(input, axis, maximum - 1, fuzz); |
| 93 | 95 | |
| 94 | 96 | axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE; |
| 95 | | − data_present = touchscreen_get_prop_u32(np, "touchscreen-max-pressure", |
| 96 | | − input_abs_get_max(dev, axis), |
| 97 | + data_present = touchscreen_get_prop_u32(dev, |
| 98 | + "touchscreen-max-pressure", |
| 99 | + input_abs_get_max(input, axis), |
| 97 | 100 | &maximum) | |
| 98 | | − touchscreen_get_prop_u32(np, "touchscreen-fuzz-pressure", |
| 99 | | − input_abs_get_fuzz(dev, axis), |
| 101 | + touchscreen_get_prop_u32(dev, |
| 102 | + "touchscreen-fuzz-pressure", |
| 103 | + input_abs_get_fuzz(input, axis), |
| 100 | 104 | &fuzz); |
| 101 | 105 | if (data_present) |
| 102 | | − touchscreen_set_params(dev, axis, maximum, fuzz); |
| 106 | + touchscreen_set_params(input, axis, maximum, fuzz); |
| 103 | 107 | } |
| 104 | | −EXPORT_SYMBOL(touchscreen_parse_of_params); |
| 108 | +EXPORT_SYMBOL(touchscreen_parse_properties); |