From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: linux-input@vger.kernel.org, devicetree@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Henrik Rydberg <rydberg@bitmath.org>,
Dmitry Osipenko <digetx@gmail.com>,
James Chen <james.chen@emc.com.tw>,
Johnny Chuang <johnny.chuang@emc.com.tw>,
linux-kernel@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh-dt@kernel.org>,
Scott Liu <scott.liu@emc.com.tw>
Subject: [PATCH v2 4/9] input: elants: override touchscreen info with DT properties
Date: Wed, 11 Dec 2019 17:03:22 +0100 [thread overview]
Message-ID: <77d45d5208804fd99fb4bfae27a43b1da4abf90f.1576079249.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1576079249.git.mirq-linux@rere.qmqm.pl>
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@gmail.com>
[moved "prop" before DMA buffer]
Signed-off-by: Michał Mirosław <mirq-linux@rere.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
next prev parent reply other threads:[~2019-12-11 16:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 16:03 [PATCH v2 0/9] input: elants: Support Asus TF300T touchscreen Michał Mirosław
2019-12-11 16:03 ` [PATCH v2 3/9] input: elants: remove unused axes Michał Mirosław
2019-12-12 0:34 ` Dmitry Osipenko
2019-12-11 16:03 ` [PATCH v2 2/9] input: elants: support old touch report format Michał Mirosław
2019-12-12 0:54 ` Dmitry Osipenko
2019-12-12 19:45 ` Michał Mirosław
2019-12-13 0:06 ` Dmitry Osipenko
2019-12-11 16:03 ` [PATCH v2 1/9] input: elants: document some registers and values Michał Mirosław
2019-12-12 0:34 ` Dmitry Osipenko
2019-12-11 16:03 ` Michał Mirosław [this message]
2019-12-11 16:03 ` [PATCH v2 6/9] input: elants: read touchscreen size for EKTF3624 Michał Mirosław
2019-12-12 0:39 ` Dmitry Osipenko
2019-12-11 16:03 ` [PATCH v2 5/9] input: elants: refactor elants_i2c_execute_command() Michał Mirosław
2019-12-12 0:30 ` Dmitry Osipenko
2019-12-11 16:03 ` [PATCH v2 7/9] input: elants: support 0x66 reply opcode for reporting touches Michał Mirosław
2019-12-11 16:03 ` [PATCH v2 8/9] dt-bindings: input: elants-i2c: Document common touchscreen properties Michał Mirosław
2019-12-12 0:58 ` Dmitry Osipenko
2019-12-12 1:00 ` Dmitry Osipenko
2019-12-19 21:39 ` Rob Herring
2019-12-11 16:03 ` [PATCH v2 9/9] dt-bindings: input: elants-i2c: Document eKTF3624 Michał Mirosław
2019-12-19 21:43 ` Rob Herring
2019-12-20 1:10 ` Dmitry Osipenko
2019-12-12 0:29 ` [PATCH v2 0/9] input: elants: Support Asus TF300T touchscreen Dmitry Osipenko
2019-12-12 19:24 ` Dmitry Torokhov
2020-01-07 5:33 ` Dmitry Osipenko
2020-01-08 15:00 ` Johnny.Chuang
2020-01-08 15:37 ` Dmitry Osipenko
2020-01-23 19:16 ` Dmitry Osipenko
2020-02-05 22:04 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=77d45d5208804fd99fb4bfae27a43b1da4abf90f.1576079249.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=james.chen@emc.com.tw \
--cc=johnny.chuang@emc.com.tw \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh-dt@kernel.org \
--cc=rydberg@bitmath.org \
--cc=scott.liu@emc.com.tw \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).