From: Alistair Francis <alistair@alistair23.me>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
linux-imx@nxp.com, kernel@pengutronix.de, pinglinux@gmail.com,
tatsunosuke.tobita@wacom.com, junkpainting@gmail.com,
ping.cheng@wacom.com
Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com,
robh+dt@kernel.org, devicetree@vger.kernel.org,
Alistair Francis <alistair@alistair23.me>
Subject: [PATCH] Input: wacom_i2c - Allow flipping the values from the DT
Date: Sun, 29 Aug 2021 19:19:14 +1000 [thread overview]
Message-ID: <20210829091925.190-3-alistair@alistair23.me> (raw)
In-Reply-To: <20210829091925.190-1-alistair@alistair23.me>
Allow the device tree properties to flip the tilx, position or distance
values.
This is required for the stylus to work correctly on the reMarkable 2.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
.../input/touchscreen/wacom,generic.yaml | 20 +++++++++++
drivers/input/touchscreen/wacom_i2c.c | 36 +++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,generic.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,generic.yaml
index a8a7f362b0ce..d451c9a235b6 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/wacom,generic.yaml
+++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,generic.yaml
@@ -25,6 +25,26 @@ properties:
vdd-supply:
description: Power Supply
+ flip-tilt-x:
+ type: boolean
+ description: Flip the tilt X values read from device
+
+ flip-tilt-y:
+ type: boolean
+ description: Flip the tilt Y values read from device
+
+ flip-pos-x:
+ type: boolean
+ description: Flip the X position values read from device
+
+ flip-pos-y:
+ type: boolean
+ description: Flip the Y position values read from device
+
+ flip-distance:
+ type: boolean
+ description: Flip the distance values read from device
+
required:
- compatible
- reg
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index f78a43212901..903353106ca8 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -105,6 +105,12 @@ struct wacom_i2c {
u8 data[WACOM_QUERY_SIZE];
bool prox;
int tool;
+
+ bool flip_tilt_x;
+ bool flip_tilt_y;
+ bool flip_pos_x;
+ bool flip_pos_y;
+ bool flip_distance;
};
static int wacom_query_device(struct i2c_client *client,
@@ -198,6 +204,19 @@ static int wacom_query_device(struct i2c_client *client,
return 0;
}
+#ifdef CONFIG_OF
+static void wacom_of_read(struct wacom_i2c *wac_i2c)
+{
+ struct i2c_client *client = wac_i2c->client;
+
+ wac_i2c->flip_tilt_x = of_property_read_bool(client->dev.of_node, "flip-tilt-x");
+ wac_i2c->flip_tilt_y = of_property_read_bool(client->dev.of_node, "flip-tilt-y");
+ wac_i2c->flip_pos_x = of_property_read_bool(client->dev.of_node, "flip-pos-x");
+ wac_i2c->flip_pos_y = of_property_read_bool(client->dev.of_node, "flip-pos-y");
+ wac_i2c->flip_distance = of_property_read_bool(client->dev.of_node, "flip-distance");
+}
+#endif
+
static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
{
struct wacom_i2c *wac_i2c = dev_id;
@@ -234,6 +253,13 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
wac_i2c->prox = data[3] & 0x20;
+ // Flip the values based on properties from the device tree
+ distance = wac_i2c->flip_distance ? -distance : distance;
+ x = wac_i2c->flip_pos_x ? (features->x_max - x) : x;
+ y = wac_i2c->flip_pos_y ? (features->y_max - y) : y;
+ tilt_x = wac_i2c->flip_tilt_x ? -tilt_x : tilt_x;
+ tilt_y = wac_i2c->flip_tilt_y ? -tilt_y : tilt_y;
+
touchscreen_report_pos(input, &wac_i2c->props, features->x_max,
features->y_max, true);
input_report_key(input, BTN_TOUCH, tsw || ers);
@@ -361,6 +387,16 @@ static int wacom_i2c_probe(struct i2c_client *client,
return error;
}
+#ifdef CONFIG_OF
+ wacom_of_read(wac_i2c);
+#else
+ wac_i2c->flip_tilt_x = false;
+ wac_i2c->flip_tilt_y = false;
+ wac_i2c->flip_pos_x = false;
+ wac_i2c->flip_pos_y = false;
+ wac_i2c->flip_distance = false;
+#endif
+
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2021-08-29 9:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-29 9:19 [PATCH v10 00/12] Add Wacom I2C support to rM2 Alistair Francis
2021-08-29 9:19 ` [PATCH v10 01/12] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-08-29 9:19 ` Alistair Francis [this message]
2021-08-29 9:19 ` [PATCH v10 02/12] dt-bindings: touchscreen: Initial commit of wacom,i2c Alistair Francis
2021-08-29 9:19 ` [PATCH v10 03/12] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-08-29 9:19 ` [PATCH v10 04/12] Input: wacom_i2c - Add touchscren properties Alistair Francis
2021-08-29 9:19 ` [PATCH v10 05/12] Input: wacom_i2c - Read the descriptor values Alistair Francis
2021-08-30 20:44 ` Dmitry Torokhov
[not found] ` <PA4PR07MB7407FE9FE271191AC52F7EA387CE9@PA4PR07MB7407.eurprd07.prod.outlook.com>
2021-09-07 6:05 ` Dmitry Torokhov
[not found] ` <CAF8JNh+PcYuaLL=ToS0hOT62YbVmMWY9BCT-CGx_x+AkKuO_Tw@mail.gmail.com>
2021-09-08 5:55 ` Dmitry Torokhov
2021-09-10 4:10 ` Tobita, Tatsunosuke
2021-10-06 7:08 ` Tobita, Tatsunosuke
2021-10-06 18:02 ` Dmitry Torokhov
2021-10-12 23:41 ` Tobita, Tatsunosuke
2021-09-17 20:43 ` Ping Cheng
2021-09-21 4:35 ` Dmitry Torokhov
2021-09-29 7:50 ` Alistair Francis
2021-08-29 9:19 ` [PATCH v10 06/12] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-08-29 9:19 ` [PATCH v10 07/12] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-08-31 22:28 ` Kari Argillander
2021-08-29 9:19 ` [PATCH v10 08/12] Input: wacom_i2c - Add support for vdd regulator Alistair Francis
2021-08-29 9:19 ` [PATCH v10 09/12] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
2021-08-29 9:19 ` [PATCH v10 10/12] Input: wacom_i2c - Allow flipping the values from the DT Alistair Francis
2021-08-31 21:54 ` Rob Herring
2021-08-29 9:19 ` [PATCH v10 11/12] ARM: imx_v6_v7_defconfig: Enable Wacom I2C Alistair Francis
2021-08-29 9:19 ` [PATCH v10 12/12] ARM: dts: imx7d: remarkable2: add wacom digitizer device Alistair Francis
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=20210829091925.190-3-alistair@alistair23.me \
--to=alistair@alistair23.me \
--cc=alistair23@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=junkpainting@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ping.cheng@wacom.com \
--cc=pinglinux@gmail.com \
--cc=robh+dt@kernel.org \
--cc=tatsunosuke.tobita@wacom.com \
/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).