From: Andreas Kemnade <andreas@kemnade.info>
To: dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, andreas@kemnade.info, hdegoede@redhat.com,
andy.shevchenko@gmail.com, u.kleine-koenig@pengutronix.de,
siebren.vroegindeweij@hotmail.com, linux-input@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Input: ektf2127 - add ektf2232 support
Date: Thu, 2 May 2024 20:58:19 +0200 [thread overview]
Message-ID: <20240502185819.788716-3-andreas@kemnade.info> (raw)
In-Reply-To: <20240502185819.788716-1-andreas@kemnade.info>
The chip is similar, but has status bits at different positions,
so use the correct bits.
Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
---
drivers/input/touchscreen/ektf2127.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c
index cc3103b9cbfba..5c2a6bfc63d84 100644
--- a/drivers/input/touchscreen/ektf2127.c
+++ b/drivers/input/touchscreen/ektf2127.c
@@ -46,6 +46,7 @@ struct ektf2127_ts {
struct input_dev *input;
struct gpio_desc *power_gpios;
struct touchscreen_properties prop;
+ bool shifted_status;
};
static void ektf2127_parse_coordinates(const u8 *buf, unsigned int touch_count,
@@ -112,8 +113,13 @@ static void ektf2127_report2_contact(struct ektf2127_ts *ts, int slot,
static void ektf2127_report2_event(struct ektf2127_ts *ts, const u8 *buf)
{
- ektf2127_report2_contact(ts, 0, &buf[1], !!(buf[7] & 2));
- ektf2127_report2_contact(ts, 1, &buf[4], !!(buf[7] & 4));
+ if (ts->shifted_status) {
+ ektf2127_report2_contact(ts, 0, &buf[1], !!(buf[7] & 1));
+ ektf2127_report2_contact(ts, 1, &buf[4], !!(buf[7] & 2));
+ } else {
+ ektf2127_report2_contact(ts, 0, &buf[1], !!(buf[7] & 2));
+ ektf2127_report2_contact(ts, 1, &buf[4], !!(buf[7] & 4));
+ }
input_mt_sync_frame(ts->input);
input_sync(ts->input);
@@ -303,6 +309,10 @@ static int ektf2127_probe(struct i2c_client *client)
return error;
ts->input = input;
+ if (dev->of_node &&
+ of_device_is_compatible(dev->of_node, "elan,ektf2232"))
+ ts->shifted_status = true;
+
input_set_drvdata(input, ts);
error = devm_request_threaded_irq(dev, client->irq,
@@ -329,6 +339,7 @@ static int ektf2127_probe(struct i2c_client *client)
static const struct of_device_id ektf2127_of_match[] = {
{ .compatible = "elan,ektf2127" },
{ .compatible = "elan,ektf2132" },
+ { .compatible = "elan,ektf2232" },
{}
};
MODULE_DEVICE_TABLE(of, ektf2127_of_match);
--
2.39.2
next prev parent reply other threads:[~2024-05-02 18:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 18:58 [PATCH 0/2] Input: Add ektf2232 support Andreas Kemnade
2024-05-02 18:58 ` [PATCH 1/2] dt-bindings: touchscreen: convert elan,ektf2127 to json-schema Andreas Kemnade
2024-05-03 7:07 ` Krzysztof Kozlowski
2024-05-02 18:58 ` Andreas Kemnade [this message]
2024-05-02 19:16 ` [PATCH 2/2] Input: ektf2127 - add ektf2232 support Andy Shevchenko
2024-05-02 23:10 ` Dmitry Torokhov
2024-05-03 3:37 ` Andy Shevchenko
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=20240502185819.788716-3-andreas@kemnade.info \
--to=andreas@kemnade.info \
--cc=andy.shevchenko@gmail.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=krzk+dt@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=siebren.vroegindeweij@hotmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).