lkml.org 
[lkml]   [2019]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/6] input: elants: support common touchscreen DT properties
Support common DT properties like axis inversions to complement
information obtained from device's firmware.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/input/touchscreen/elants_i2c.c | 27 ++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index eadd26d5a06f..02bd5e3e2171 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -31,6 +31,7 @@
#include <linux/buffer_head.h>
#include <linux/slab.h>
#include <linux/firmware.h>
+#include <linux/input/touchscreen.h>
#include <linux/input/mt.h>
#include <linux/acpi.h>
#include <linux/of.h>
@@ -146,8 +147,7 @@ struct elants_data {
u16 hw_version;
unsigned int x_res; /* resolution in units/mm */
unsigned int y_res;
- unsigned int x_max;
- unsigned int y_max;
+ struct touchscreen_properties prop;

enum elants_state state;
enum elants_iap_mode iap_mode;
@@ -498,10 +498,10 @@ static int elants_i2c_query_ts_info(struct elants_data *ts)
rows, cols, osr);
} else {
/* translate trace number to TS resolution */
- ts->x_max = ELAN_TS_RESOLUTION(rows, osr);
- ts->x_res = DIV_ROUND_CLOSEST(ts->x_max, phy_x);
- ts->y_max = ELAN_TS_RESOLUTION(cols, osr);
- ts->y_res = DIV_ROUND_CLOSEST(ts->y_max, phy_y);
+ ts->prop.max_x = ELAN_TS_RESOLUTION(rows, osr);
+ ts->x_res = DIV_ROUND_CLOSEST(ts->prop.max_x, phy_x);
+ ts->prop.max_y = ELAN_TS_RESOLUTION(cols, osr);
+ ts->y_res = DIV_ROUND_CLOSEST(ts->prop.max_y, phy_y);
}

return 0;
@@ -833,8 +833,7 @@ static void elants_i2c_mt_event(struct elants_data *ts, u8 *buf,

input_mt_slot(input, i);
input_mt_report_slot_state(input, MT_TOOL_FINGER, true);
- input_event(input, EV_ABS, ABS_MT_POSITION_X, x);
- input_event(input, EV_ABS, ABS_MT_POSITION_Y, y);
+ touchscreen_report_pos(input, &ts->prop, x, y, true);
input_event(input, EV_ABS, ABS_MT_PRESSURE, p);
input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, w);

@@ -1251,13 +1250,15 @@ static int elants_i2c_probe(struct i2c_client *client,
ts->input->name = "Elan Touchscreen";
ts->input->id.bustype = BUS_I2C;

+ touchscreen_parse_properties(ts->input, true, &ts->prop);
+
__set_bit(BTN_TOUCH, ts->input->keybit);
__set_bit(EV_ABS, ts->input->evbit);
__set_bit(EV_KEY, ts->input->evbit);

/* Single touch input params setup */
- input_set_abs_params(ts->input, ABS_X, 0, ts->x_max, 0, 0);
- input_set_abs_params(ts->input, ABS_Y, 0, ts->y_max, 0, 0);
+ input_set_abs_params(ts->input, ABS_X, 0, ts->prop.max_x, 0, 0);
+ input_set_abs_params(ts->input, ABS_Y, 0, ts->prop.max_y, 0, 0);
input_set_abs_params(ts->input, ABS_PRESSURE, 0, 255, 0, 0);
input_abs_set_res(ts->input, ABS_X, ts->x_res);
input_abs_set_res(ts->input, ABS_Y, ts->y_res);
@@ -1271,8 +1272,10 @@ static int elants_i2c_probe(struct i2c_client *client,
return error;
}

- input_set_abs_params(ts->input, ABS_MT_POSITION_X, 0, ts->x_max, 0, 0);
- input_set_abs_params(ts->input, ABS_MT_POSITION_Y, 0, ts->y_max, 0, 0);
+ input_set_abs_params(ts->input, ABS_MT_POSITION_X,
+ 0, ts->prop.max_x, 0, 0);
+ input_set_abs_params(ts->input, ABS_MT_POSITION_Y,
+ 0, ts->prop.max_y, 0, 0);
input_set_abs_params(ts->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
input_set_abs_params(ts->input, ABS_MT_PRESSURE, 0, 255, 0, 0);
input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->x_res);
--
2.20.1
\
 
 \ /
  Last update: 2019-12-10 01:19    [W:0.077 / U:2.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site