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 v2 2/6] input/touchscreen: Add device tree support to wacom_i2c
Date: Wed, 20 Jan 2021 22:56:39 -0800 [thread overview]
Message-ID: <20210121065643.342-3-alistair@alistair23.me> (raw)
In-Reply-To: <20210121065643.342-1-alistair@alistair23.me>
Allow the wacom-i2c device to be exposed via device tree.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
.../input/touchscreen/wacom,wacom-i2c.yaml | 4 ++++
drivers/input/touchscreen/wacom_i2c.c | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
index b36d22cd20a2..06ad5ee561af 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
+++ b/Documentation/devicetree/bindings/input/touchscreen/wacom,wacom-i2c.yaml
@@ -22,6 +22,9 @@ properties:
interrupts:
maxItems: 1
+ vdd-supply:
+ maxItems: 1
+
required:
- compatible
- reg
@@ -40,5 +43,6 @@ examples:
reg = <0x9>;
interrupt-parent = <&gpio1>;
interrupts = <9 IRQ_TYPE_LEVEL_LOW>;
+ vdd-supply = <®_touch>;
};
};
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 1afc6bde2891..ec6e0aff8deb 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -11,7 +11,9 @@
#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>
#define WACOM_CMD_QUERY0 0x04
@@ -32,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;
@@ -187,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,
@@ -214,6 +218,7 @@ static int wacom_i2c_probe(struct i2c_client *client,
}
i2c_set_clientdata(client, wac_i2c);
+
return 0;
err_free_irq:
@@ -262,10 +267,21 @@ static const struct i2c_device_id wacom_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, wacom_i2c_id);
+#ifdef CONFIG_OF
+static const struct of_device_id wacom_i2c_of_match_table[] = {
+ { .compatible = "wacom,wacom-i2c" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table);
+#endif
+
static struct i2c_driver wacom_i2c_driver = {
.driver = {
.name = "wacom_i2c",
.pm = &wacom_i2c_pm,
+#ifdef CONFIG_OF
+ .of_match_table = of_match_ptr(wacom_i2c_of_match_table),
+#endif
},
.probe = wacom_i2c_probe,
--
2.29.2
next prev parent reply other threads:[~2021-01-21 7:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 6:56 [PATCH v2 0/6] Add Wacom I2C support to rM2 Alistair Francis
2021-01-21 6:56 ` [PATCH v2 1/6] devicetree/bindings: Initial commit of wacom,wacom-i2c Alistair Francis
2021-01-22 15:49 ` [PATCH v2 1/6] devicetree/bindings: Initial commit of wacom, wacom-i2c Marco Felsch
2021-01-21 6:56 ` Alistair Francis [this message]
2021-01-22 15:57 ` [PATCH v2 2/6] input/touchscreen: Add device tree support to wacom_i2c Marco Felsch
2021-01-21 6:56 ` [PATCH v2 3/6] touchscreen/wacom_i2c: Add support for distance and tilt x/y Alistair Francis
2021-01-22 16:00 ` Marco Felsch
2021-01-21 6:56 ` [PATCH v2 4/6] touchscreen/wacom_i2c: Clean up the query device fields Alistair Francis
2021-01-21 6:56 ` [PATCH v2 5/6] touchscreen/wacom_i2c: Add support for vdd regulator Alistair Francis
2021-01-21 6:56 ` [PATCH v2 6/6] arch/arm: reMarkable2: Enable wacom_i2c Alistair Francis
2021-01-22 15:32 ` Marco Felsch
2021-01-23 8:04 ` Alistair Francis
2021-01-22 16:14 ` [PATCH v2 0/6] Add Wacom I2C support to rM2 Marco Felsch
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=20210121065643.342-3-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).