From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: linux-input@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-kernel@vger.kernel.org, Dmitry Osipenko <digetx@gmail.com>
Subject: [PATCH 4/6] input: elants: detect max_x/y from hardware
Date: Tue, 10 Dec 2019 01:19:18 +0100 [thread overview]
Message-ID: <5b017222a771fcef78876a18bcd80603c29c25f0.1575936961.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1575936961.git.mirq-linux@rere.qmqm.pl>
Read max_x/y from hardware when not specified in devicetree.
elants_i2c_initialize() call is moved after inputdev allocation (but
still before making it visible) to allow the function to see DT-provided
values.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/input/touchscreen/elants_i2c.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 02bd5e3e2171..2e6c9aa60496 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -498,9 +498,11 @@ static int elants_i2c_query_ts_info(struct elants_data *ts)
rows, cols, osr);
} else {
/* translate trace number to TS resolution */
- ts->prop.max_x = ELAN_TS_RESOLUTION(rows, osr);
+ if (!ts->prop.max_x)
+ 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);
+ if (!ts->prop.max_y)
+ ts->prop.max_y = ELAN_TS_RESOLUTION(cols, osr);
ts->y_res = DIV_ROUND_CLOSEST(ts->prop.max_y, phy_y);
}
@@ -1235,12 +1237,6 @@ static int elants_i2c_probe(struct i2c_client *client,
return -ENXIO;
}
- error = elants_i2c_initialize(ts);
- if (error) {
- dev_err(&client->dev, "failed to initialize: %d\n", error);
- return error;
- }
-
ts->input = devm_input_allocate_device(&client->dev);
if (!ts->input) {
dev_err(&client->dev, "Failed to allocate input device\n");
@@ -1252,6 +1248,12 @@ static int elants_i2c_probe(struct i2c_client *client,
touchscreen_parse_properties(ts->input, true, &ts->prop);
+ error = elants_i2c_initialize(ts);
+ if (error) {
+ dev_err(&client->dev, "failed to initialize: %d\n", error);
+ return error;
+ }
+
__set_bit(BTN_TOUCH, ts->input->keybit);
__set_bit(EV_ABS, ts->input->evbit);
__set_bit(EV_KEY, ts->input->evbit);
--
2.20.1
next prev parent reply other threads:[~2019-12-10 0:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 0:19 [PATCH 0/6] input: elants: Support Asus TF300T touchscreen Michał Mirosław
2019-12-10 0:19 ` [PATCH 2/6] input: elants: support old touch report format Michał Mirosław
2019-12-10 0:19 ` [PATCH 3/6] input: elants: support common touchscreen DT properties Michał Mirosław
2019-12-10 1:03 ` Dmitry Osipenko
2019-12-10 1:07 ` Dmitry Osipenko
2019-12-10 2:38 ` Michał Mirosław
2019-12-10 15:21 ` Dmitry Osipenko
2019-12-11 3:28 ` Michał Mirosław
2019-12-11 15:26 ` Dmitry Osipenko
2019-12-10 0:19 ` [PATCH 1/6] input: elants: document some registers and values Michał Mirosław
2019-12-10 0:19 ` [PATCH 6/6] input: elants: read touchscreen size for EKTF3624 Michał Mirosław
2019-12-10 1:23 ` Dmitry Osipenko
2019-12-10 1:48 ` Dmitry Osipenko
2019-12-10 18:32 ` kbuild test robot
2019-12-10 0:19 ` [PATCH 5/6] input: elants: refactor elants_i2c_execute_command() Michał Mirosław
2019-12-10 1:34 ` Dmitry Osipenko
2019-12-10 0:19 ` Michał Mirosław [this message]
2019-12-10 0:59 ` [PATCH 0/6] input: elants: Support Asus TF300T touchscreen Dmitry Osipenko
2019-12-10 15:26 ` 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=5b017222a771fcef78876a18bcd80603c29c25f0.1575936961.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=digetx@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).