Commit af34290c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.14/drivers-signed' of... 

Merge tag 'omap-for-v6.14/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/drivers-2

arm/omap: drivers: updates for v6.14

* tag 'omap-for-v6.14/drivers-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  Input: tsc2007 - accept standard properties
parents 45c88e9e 6ef4ea3c

drivers/input/touchscreen/tsc2007.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifndef _TSC2007_H

#define _TSC2007_H



#include <linux/input/touchscreen.h>

struct gpio_desc;



#define TSC2007_MEASURE_TEMP0		(0x0 << 4)
@@ -63,6 +64,7 @@ struct tsc2007 { 


	struct i2c_client	*client;



	struct touchscreen_properties prop;

	u16			model;

	u16			x_plate_ohms;

	u16			max_rt;

drivers/input/touchscreen/tsc2007_core.c

+2 −3
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) 
			rt = ts->max_rt - rt;



			input_report_key(input, BTN_TOUCH, 1);

			input_report_abs(input, ABS_X, tc.x);

			input_report_abs(input, ABS_Y, tc.y);

			touchscreen_report_pos(input, &ts->prop, tc.x, tc.y, false);

			input_report_abs(input, ABS_PRESSURE, rt);



			input_sync(input);
@@ -339,9 +338,9 @@ static int tsc2007_probe(struct i2c_client *client) 
	input_set_drvdata(input_dev, ts);



	input_set_capability(input_dev, EV_KEY, BTN_TOUCH);



	input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0);

	input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, ts->fuzzy, 0);

	touchscreen_parse_properties(input_dev, false, &ts->prop);

	input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT,

			     ts->fuzzz, 0);