Commit 4200e831 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: of_touchscreen - switch to using device properties 



Let's switch form OF to device properties so that common parsing code could
work not only on device tree but also on ACPI-based platforms.

Reviewed-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 51717869

drivers/input/touchscreen/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ menuconfig INPUT_TOUCHSCREEN 


if INPUT_TOUCHSCREEN



config OF_TOUCHSCREEN

config TOUCHSCREEN_PROPERTIES

	def_tristate INPUT

	depends on INPUT && OF

	depends on INPUT



config TOUCHSCREEN_88PM860X

	tristate "Marvell 88PM860x touchscreen"

drivers/input/touchscreen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


wm97xx-ts-y := wm97xx-core.o



obj-$(CONFIG_OF_TOUCHSCREEN)		+= of_touchscreen.o

obj-$(CONFIG_TOUCHSCREEN_PROPERTIES)	+= of_touchscreen.o

obj-$(CONFIG_TOUCHSCREEN_88PM860X)	+= 88pm860x-ts.o

obj-$(CONFIG_TOUCHSCREEN_AD7877)	+= ad7877.o

obj-$(CONFIG_TOUCHSCREEN_AD7879)	+= ad7879.o

drivers/input/touchscreen/edt-ft5x06.c

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client, 
			     0, tsdata->num_y * 64 - 1, 0, 0);



	if (!pdata)

		touchscreen_parse_of_params(input, true);

		touchscreen_parse_properties(input, true);



	error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, INPUT_MT_DIRECT);

	if (error) {

drivers/input/touchscreen/of_touchscreen.c

+30 −26
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
 *

 */



#include <linux/of.h>

#include <linux/property.h>

#include <linux/input.h>

#include <linux/input/mt.h>

#include <linux/input/touchscreen.h>



static bool touchscreen_get_prop_u32(struct device_node *np,

static bool touchscreen_get_prop_u32(struct device *dev,

				     const char *property,

				     unsigned int default_value,

				     unsigned int *value)
@@ -22,7 +22,7 @@ static bool touchscreen_get_prop_u32(struct device_node *np, 
	u32 val;

	int error;



	error = of_property_read_u32(np, property, &val);

	error = device_property_read_u32(dev, property, &val);

	if (error) {

		*value = default_value;

		return false;
@@ -51,54 +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, bool multitouch)

void touchscreen_parse_properties(struct input_dev *input, bool multitouch)

{

	struct device_node *np = dev->dev.parent->of_node;

	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;



	axis = multitouch ? ABS_MT_POSITION_X : ABS_X;

	data_present = touchscreen_get_prop_u32(np, "touchscreen-size-x",

						input_abs_get_max(dev,

	data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-x",

						input_abs_get_max(input,

								  axis) + 1,

						&maximum) |

		       touchscreen_get_prop_u32(np, "touchscreen-fuzz-x",

						input_abs_get_fuzz(dev, axis),

		       touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",

						input_abs_get_fuzz(input, axis),

						&fuzz);

	if (data_present)

		touchscreen_set_params(dev, axis, maximum - 1, fuzz);

		touchscreen_set_params(input, axis, maximum - 1, fuzz);



	axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;

	data_present = touchscreen_get_prop_u32(np, "touchscreen-size-y",

						input_abs_get_max(dev,

	data_present = touchscreen_get_prop_u32(dev, "touchscreen-size-y",

						input_abs_get_max(input,

								  axis) + 1,

						&maximum) |

		       touchscreen_get_prop_u32(np, "touchscreen-fuzz-y",

						input_abs_get_fuzz(dev, axis),

		       touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",

						input_abs_get_fuzz(input, axis),

						&fuzz);

	if (data_present)

		touchscreen_set_params(dev, axis, maximum - 1, fuzz);

		touchscreen_set_params(input, axis, maximum - 1, fuzz);



	axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE;

	data_present = touchscreen_get_prop_u32(np, "touchscreen-max-pressure",

						input_abs_get_max(dev, axis),

	data_present = touchscreen_get_prop_u32(dev,

						"touchscreen-max-pressure",

						input_abs_get_max(input, axis),

						&maximum) |

		       touchscreen_get_prop_u32(np, "touchscreen-fuzz-pressure",

						input_abs_get_fuzz(dev, axis),

		       touchscreen_get_prop_u32(dev,

						"touchscreen-fuzz-pressure",

						input_abs_get_fuzz(input, axis),

						&fuzz);

	if (data_present)

		touchscreen_set_params(dev, axis, maximum, fuzz);

		touchscreen_set_params(input, axis, maximum, fuzz);

}

EXPORT_SYMBOL(touchscreen_parse_of_params);
 
EXPORT_SYMBOL(touchscreen_parse_properties);

drivers/input/touchscreen/tsc2005.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int tsc2005_probe(struct spi_device *spi) 
	input_set_abs_params(input_dev, ABS_PRESSURE, 0, max_p, fudge_p, 0);



	if (np)

		touchscreen_parse_of_params(input_dev, false);

		touchscreen_parse_properties(input_dev, false);



	input_dev->open = tsc2005_open;

	input_dev->close = tsc2005_close;