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 v10 05/12] Input: wacom_i2c - Read the descriptor values
Date: Sun, 29 Aug 2021 19:19:18 +1000 [thread overview]
Message-ID: <20210829091925.190-7-alistair@alistair23.me> (raw)
In-Reply-To: <20210829091925.190-1-alistair@alistair23.me>
When we query the device let's also read the descriptor from the device.
This tells us useful information, including the version, which we use to
determine a generation.
This is based on the driver from Wacom.
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
drivers/input/touchscreen/wacom_i2c.c | 64 +++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 28255c77d426..72ba4a36459b 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -16,6 +16,7 @@
#include <linux/of.h>
#include <asm/unaligned.h>
+#define WACOM_DESC_REG 0x01
#define WACOM_CMD_QUERY0 0x04
#define WACOM_CMD_QUERY1 0x00
#define WACOM_CMD_QUERY2 0x33
@@ -24,11 +25,46 @@
#define WACOM_CMD_THROW1 0x00
#define WACOM_QUERY_SIZE 19
+#define WACOM_MAX_DATA_SIZE_BG9 10
+#define WACOM_MAX_DATA_SIZE_G12 15
+#define WACOM_MAX_DATA_SIZE_AG14 17
+#define WACOM_MAX_DATA_SIZE 22
+
+/* Generation selction */
+/* Before and at G9 generation */
+#define WACOM_BG9 0
+/* G12 generation the IC supports "height"*/
+#define WACOM_G12 1
+/* After and at G14 generation the IC supports "height" and
+ * it is defined as "Z" axis
+ */
+#define WACOM_AG14 2
+
+struct wacom_desc {
+ u16 descLen;
+ u16 version;
+ u16 reportLen;
+ u16 reportReg;
+ u16 inputReg;
+ u16 maxInputLen;
+ u16 outputReg;
+ u16 maxOutputLen;
+ u16 commReg;
+ u16 dataReg;
+ u16 vendorID;
+ u16 productID;
+ u16 fwVersion;
+ u16 misc_high;
+ u16 misc_low;
+};
+
struct wacom_features {
+ struct wacom_desc desc;
int x_max;
int y_max;
int pressure_max;
char fw_version;
+ unsigned char generation;
};
struct wacom_i2c {
@@ -45,6 +81,7 @@ static int wacom_query_device(struct i2c_client *client,
struct wacom_features *features)
{
int ret;
+ u8 cmd_wac_desc[] = {WACOM_DESC_REG, 0x00};
u8 cmd1[] = { WACOM_CMD_QUERY0, WACOM_CMD_QUERY1,
WACOM_CMD_QUERY2, WACOM_CMD_QUERY3 };
u8 cmd2[] = { WACOM_CMD_THROW0, WACOM_CMD_THROW1 };
@@ -70,6 +107,33 @@ static int wacom_query_device(struct i2c_client *client,
},
};
+ /* Read the description register */
+ ret = i2c_master_send(client, cmd_wac_desc, sizeof(cmd_wac_desc));
+ if (ret < 0)
+ return ret;
+ ret = i2c_master_recv(client, (char *)&features->desc, sizeof(features->desc));
+ if (ret < 0)
+ return ret;
+
+ switch (features->desc.maxInputLen) {
+ case WACOM_MAX_DATA_SIZE_BG9:
+ features->generation = WACOM_BG9;
+ break;
+
+ case WACOM_MAX_DATA_SIZE_G12:
+ features->generation = WACOM_G12;
+ break;
+
+ case WACOM_MAX_DATA_SIZE_AG14:
+ features->generation = WACOM_AG14;
+ break;
+
+ default:
+ /* Cover all generations possible */
+ features->generation = WACOM_AG14;
+ break;
+ }
+
ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
if (ret < 0)
return ret;
--
2.31.1
next prev parent reply other threads:[~2021-08-29 9:20 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 ` [PATCH] Input: wacom_i2c - Allow flipping the values from the DT Alistair Francis
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 ` Alistair Francis [this message]
2021-08-30 20:44 ` [PATCH v10 05/12] Input: wacom_i2c - Read the descriptor values 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-7-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).