Commit 3eea8b5d authored by Maxime Ripard's avatar Maxime Ripard Committed by Dmitry Torokhov

Input: of_touchscreen - rework the DT parsing function

The DT parsing function currently duplicates a lot of the code to parse the
touchscreen DT properties. In order to ease further additions to this
parsing routine, rework it slightly to create new helper functions.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5037a179
...@@ -13,6 +13,33 @@ ...@@ -13,6 +13,33 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/touchscreen.h> #include <linux/input/touchscreen.h>
static u32 of_get_optional_u32(struct device_node *np,
const char *property)
{
u32 val = 0;
of_property_read_u32(np, property, &val);
return val;
}
static void touchscreen_set_params(struct input_dev *dev,
unsigned long axis,
int max, int fuzz)
{
struct input_absinfo *absinfo;
if (!test_bit(axis, dev->absbit)) {
dev_warn(&dev->dev,
"DT specifies parameters but the axis is not set up\n");
return;
}
absinfo = &dev->absinfo[axis];
absinfo->maximum = max;
absinfo->fuzz = fuzz;
}
/** /**
* touchscreen_parse_of_params - parse common touchscreen DT properties * touchscreen_parse_of_params - parse common touchscreen DT properties
* @dev: device that should be parsed * @dev: device that should be parsed
...@@ -24,22 +51,25 @@ ...@@ -24,22 +51,25 @@
void touchscreen_parse_of_params(struct input_dev *dev) void touchscreen_parse_of_params(struct input_dev *dev)
{ {
struct device_node *np = dev->dev.parent->of_node; struct device_node *np = dev->dev.parent->of_node;
struct input_absinfo *absinfo; u32 maximum, fuzz;
input_alloc_absinfo(dev); input_alloc_absinfo(dev);
if (!dev->absinfo) if (!dev->absinfo)
return; return;
absinfo = &dev->absinfo[ABS_X]; maximum = of_get_optional_u32(np, "touchscreen-size-x");
of_property_read_u32(np, "touchscreen-size-x", &absinfo->maximum); fuzz = of_get_optional_u32(np, "touchscreen-fuzz-x");
of_property_read_u32(np, "touchscreen-fuzz-x", &absinfo->fuzz); if (maximum || fuzz)
touchscreen_set_params(dev, ABS_X, maximum, fuzz);
absinfo = &dev->absinfo[ABS_Y]; maximum = of_get_optional_u32(np, "touchscreen-size-y");
of_property_read_u32(np, "touchscreen-size-y", &absinfo->maximum); fuzz = of_get_optional_u32(np, "touchscreen-fuzz-y");
of_property_read_u32(np, "touchscreen-fuzz-y", &absinfo->fuzz); if (maximum || fuzz)
touchscreen_set_params(dev, ABS_Y, maximum, fuzz);
absinfo = &dev->absinfo[ABS_PRESSURE]; maximum = of_get_optional_u32(np, "touchscreen-max-pressure");
of_property_read_u32(np, "touchscreen-max-pressure", &absinfo->maximum); fuzz = of_get_optional_u32(np, "touchscreen-fuzz-pressure");
of_property_read_u32(np, "touchscreen-fuzz-pressure", &absinfo->fuzz); if (maximum || fuzz)
touchscreen_set_params(dev, ABS_PRESSURE, maximum, fuzz);
} }
EXPORT_SYMBOL(touchscreen_parse_of_params); EXPORT_SYMBOL(touchscreen_parse_of_params);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment