From: Alistair Francis <alistair@alistair23.me> To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com, Alistair Francis <alistair@alistair23.me> Subject: [PATCH v5 4/9] Input: wacom_i2c - Add touchscren properties Date: Mon, 19 Apr 2021 07:00:59 +1000 [thread overview] Message-ID: <20210418210104.2876-4-alistair@alistair23.me> (raw) In-Reply-To: <20210418210104.2876-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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index dd3fc54d3825..28290724b3da 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,7 @@ struct wacom_features { struct wacom_i2c { struct i2c_client *client; struct input_dev *input; + struct touchscreen_properties props; u8 data[WACOM_QUERY_SIZE]; bool prox; int tool; @@ -114,12 +116,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); @@ -188,6 +190,7 @@ static int wacom_i2c_probe(struct i2c_client *client, __set_bit(BTN_STYLUS2, input->keybit); __set_bit(BTN_TOUCH, input->keybit); + 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, -- 2.31.1
next prev parent reply other threads:[~2021-04-19 8:39 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-18 21:00 [PATCH v5 1/9] dt-bindings: Add Wacom to vendor bindings Alistair Francis 2021-04-18 21:00 ` [PATCH v5 2/9] dt-bindings: touchscreen: Initial commit of wacom,generic Alistair Francis 2021-04-18 21:00 ` [PATCH v5 3/9] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis 2021-04-18 21:00 ` Alistair Francis [this message] 2021-04-18 21:01 ` [PATCH v5 5/9] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis 2021-04-18 21:01 ` [PATCH v5 6/9] Input: wacom_i2c - Clean up the query device fields Alistair Francis 2021-04-18 21:01 ` [PATCH v5 7/9] Input: wacom_i2c - Add support for vdd regulator Alistair Francis 2021-04-18 21:01 ` [PATCH v5 8/9] ARM: imx_v6_v7_defconfig: Enable Wacom I2C Alistair Francis 2021-04-18 21:01 ` [PATCH v5 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=20210418210104.2876-4-alistair@alistair23.me \ --to=alistair@alistair23.me \ --cc=alistair23@gmail.com \ --cc=dmitry.torokhov@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-imx@nxp.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --subject='Re: [PATCH v5 4/9] Input: wacom_i2c - Add touchscren properties' \ /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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.