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 v4 04/10] Input: wacom_i2c - Add touchscren properties
Date: Thu, 25 Mar 2021 21:52:24 -0400 [thread overview]
Message-ID: <20210326015229.141-4-alistair@alistair23.me> (raw)
In-Reply-To: <20210326015229.141-1-alistair@alistair23.me>
Connect touchscreen properties to the wacom_i2c.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
v4:
- Add touchscreen_report_pos() as well
drivers/input/touchscreen/wacom_i2c.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index eada68770671..ee1829dd35f4 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;
@@ -188,6 +190,9 @@ 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);
+ touchscreen_report_pos(input, &wac_i2c->props, features.x_max,
+ features.y_max, true);
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.0
next prev parent reply other threads:[~2021-03-26 1:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 1:52 [PATCH v4 01/10] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-03-26 1:52 ` [PATCH v4 02/10] dt-bindings: touchscreen: Initial commit of wacom,generic Alistair Francis
2021-03-26 1:52 ` [PATCH v4 03/10] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-03-29 19:11 ` Dmitry Torokhov
2021-03-26 1:52 ` Alistair Francis [this message]
2021-03-29 19:08 ` [PATCH v4 04/10] Input: wacom_i2c - Add touchscren properties Dmitry Torokhov
2021-03-30 0:00 ` Alistair Francis
2021-03-26 1:52 ` [PATCH v4 05/10] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-03-29 19:12 ` Dmitry Torokhov
2021-03-26 1:52 ` [PATCH v4 06/10] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-03-26 1:52 ` [PATCH v4 07/10] Input: wacom_i2c - Add support for reset control Alistair Francis
2021-03-29 20:33 ` Dmitry Torokhov
2021-04-27 5:56 ` Alistair Francis
2021-03-26 1:52 ` [PATCH v4 08/10] Input: wacom_i2c - Add support for vdd regulator Alistair Francis
2021-03-26 1:52 ` [PATCH v4 09/10] ARM: imx_v6_v7_defconfig: Enable Wacom I2C 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=20210326015229.141-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 \
/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).