From: Alistair Francis <alistair@alistair23.me>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
linux-imx@nxp.com, kernel@pengutronix.d, pinglinux@gmail.com,
tatsunosuke.tobita@wacom.com, junkpainting@gmail.com,
ping.cheng@wacom.com
Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com,
Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v6 4/9] Input: wacom_i2c - Add touchscren properties
Date: Tue, 15 Jun 2021 20:30:09 +1000 [thread overview]
Message-ID: <20210615103014.798-5-alistair@alistair23.me> (raw)
In-Reply-To: <20210615103014.798-1-alistair@alistair23.me>
Connect touchscreen properties to the wacom_i2c.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
drivers/input/touchscreen/wacom_i2c.c | 28 ++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 6053595f2b30..b47bc08efdd1 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -11,6 +11,7 @@
#include <linux/i2c.h>
#include <linux/slab.h>
#include <linux/irq.h>
+#include <linux/input/touchscreen.h>
#include <linux/interrupt.h>
#include <linux/of.h>
#include <asm/unaligned.h>
@@ -33,6 +34,8 @@ struct wacom_features {
struct wacom_i2c {
struct i2c_client *client;
struct input_dev *input;
+ struct touchscreen_properties props;
+ struct wacom_features features;
u8 data[WACOM_QUERY_SIZE];
bool prox;
int tool;
@@ -90,6 +93,7 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
{
struct wacom_i2c *wac_i2c = dev_id;
struct input_dev *input = wac_i2c->input;
+ struct wacom_features *features = &wac_i2c->features;
u8 *data = wac_i2c->data;
unsigned int x, y, pressure;
unsigned char tsw, f1, f2, ers;
@@ -114,12 +118,12 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
wac_i2c->prox = data[3] & 0x20;
+ touchscreen_report_pos(input, &wac_i2c->props, features->x_max,
+ features->y_max, true);
input_report_key(input, BTN_TOUCH, tsw || ers);
input_report_key(input, wac_i2c->tool, wac_i2c->prox);
input_report_key(input, BTN_STYLUS, f1);
input_report_key(input, BTN_STYLUS2, f2);
- input_report_abs(input, ABS_X, x);
- input_report_abs(input, ABS_Y, y);
input_report_abs(input, ABS_PRESSURE, pressure);
input_sync(input);
@@ -151,7 +155,7 @@ static int wacom_i2c_probe(struct i2c_client *client,
struct device *dev = &client->dev;
struct wacom_i2c *wac_i2c;
struct input_dev *input;
- struct wacom_features features = { 0 };
+ struct wacom_features *features;
int error;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
@@ -159,14 +163,15 @@ static int wacom_i2c_probe(struct i2c_client *client,
return -EIO;
}
- error = wacom_query_device(client, &features);
- if (error)
- return error;
-
wac_i2c = devm_kzalloc(dev, sizeof(*wac_i2c), GFP_KERNEL);
if (!wac_i2c)
return -ENOMEM;
+ features = &wac_i2c->features;
+ error = wacom_query_device(client, features);
+ if (error)
+ return error;
+
wac_i2c->client = client;
input = devm_input_allocate_device(dev);
@@ -178,7 +183,7 @@ static int wacom_i2c_probe(struct i2c_client *client,
input->name = "Wacom I2C Digitizer";
input->id.bustype = BUS_I2C;
input->id.vendor = 0x56a;
- input->id.version = features.fw_version;
+ input->id.version = features->fw_version;
input->open = wacom_i2c_open;
input->close = wacom_i2c_close;
@@ -190,10 +195,11 @@ static int wacom_i2c_probe(struct i2c_client *client,
__set_bit(BTN_STYLUS2, input->keybit);
__set_bit(BTN_TOUCH, input->keybit);
- input_set_abs_params(input, ABS_X, 0, features.x_max, 0, 0);
- input_set_abs_params(input, ABS_Y, 0, features.y_max, 0, 0);
+ touchscreen_parse_properties(input, true, &wac_i2c->props);
+ input_set_abs_params(input, ABS_X, 0, features->x_max, 0, 0);
+ input_set_abs_params(input, ABS_Y, 0, features->y_max, 0, 0);
input_set_abs_params(input, ABS_PRESSURE,
- 0, features.pressure_max, 0, 0);
+ 0, features->pressure_max, 0, 0);
input_set_drvdata(input, wac_i2c);
--
2.31.1
next prev parent reply other threads:[~2021-06-15 10:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 10:30 [PATCH v6 0/9] Add Wacom I2C support to rM2 Alistair Francis
2021-06-15 10:30 ` [PATCH v6 1/9] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-06-15 16:50 ` Dmitry Torokhov
2021-06-15 10:30 ` [PATCH v6 2/9] dt-bindings: touchscreen: Initial commit of wacom,generic Alistair Francis
2021-06-15 16:54 ` Dmitry Torokhov
2021-06-15 10:30 ` [PATCH v6 3/9] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-06-15 16:55 ` Dmitry Torokhov
2021-06-15 21:19 ` Alistair Francis
2021-06-15 10:30 ` Alistair Francis [this message]
2021-06-15 10:30 ` [PATCH v6 5/9] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-06-15 10:30 ` [PATCH v6 6/9] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-06-15 10:30 ` [PATCH v6 7/9] Input: wacom_i2c - Add support for vdd regulator Alistair Francis
2021-06-15 10:30 ` [PATCH v6 8/9] ARM: imx_v6_v7_defconfig: Enable Wacom I2C Alistair Francis
2021-06-15 10:30 ` [PATCH v6 9/9] 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=20210615103014.798-5-alistair@alistair23.me \
--to=alistair@alistair23.me \
--cc=alistair23@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=junkpainting@gmail.com \
--cc=kernel@pengutronix.d \
--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=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).