[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <77d45d5208804fd99fb4bfae27a43b1da4abf90f.1576079249.git.mirq-linux@rere.qmqm.pl>
Date: Wed, 11 Dec 2019 17:03:22 +0100
From: Michał Mirosław <mirq-linux@...e.qmqm.pl>
To: linux-input@...r.kernel.org, devicetree@...r.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>,
Henrik Rydberg <rydberg@...math.org>,
Dmitry Osipenko <digetx@...il.com>,
James Chen <james.chen@....com.tw>,
Johnny Chuang <johnny.chuang@....com.tw>,
linux-kernel@...r.kernel.org, Mark Rutland <mark.rutland@....com>,
Rob Herring <robh-dt@...nel.org>,
Scott Liu <scott.liu@....com.tw>
Subject: [PATCH v2 4/9] input: elants: override touchscreen info with DT
properties
Allow overriding of information from hardware and support additional
common DT properties like axis inversion. This is required for eg.
Nexus 7 and TF300T where the programmed values in firmware differ
from reality.
Signed-off-by: Dmitry Osipenko <digetx@...il.com>
[moved "prop" before DMA buffer]
Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
---
drivers/input/touchscreen/elants_i2c.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index ab9d63239ff5..bc24f52b2932 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -32,6 +32,7 @@
#include <linux/slab.h>
#include <linux/firmware.h>
#include <linux/input/mt.h>
+#include <linux/input/touchscreen.h>
#include <linux/acpi.h>
#include <linux/of.h>
#include <linux/gpio/consumer.h>
@@ -148,6 +149,7 @@ struct elants_data {
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;
@@ -833,8 +835,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);
@@ -1267,6 +1268,8 @@ static int elants_i2c_probe(struct i2c_client *client,
input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->x_res);
input_abs_set_res(ts->input, ABS_MT_POSITION_Y, ts->y_res);
+ touchscreen_parse_properties(ts->input, true, &ts->prop);
+
error = input_register_device(ts->input);
if (error) {
dev_err(&client->dev,
--
2.20.1
Powered by blists - more mailing lists