@@ -23,7 +23,7 @@
#define WACOM_CMD_QUERY3 0x02
#define WACOM_CMD_THROW0 0x05
#define WACOM_CMD_THROW1 0x00
-#define WACOM_QUERY_SIZE 19
+#define WACOM_QUERY_SIZE 22
#define WACOM_MAX_DATA_SIZE_BG9 10
#define WACOM_MAX_DATA_SIZE_G12 15
@@ -63,6 +63,9 @@ struct wacom_features {
int x_max;
int y_max;
int pressure_max;
+ int distance_max;
+ int tilt_x_max;
+ int tilt_y_max;
char fw_version;
unsigned char generation;
};
@@ -144,6 +147,15 @@ static int wacom_query_device(struct i2c_client *client,
features->y_max = get_unaligned_le16(&data[5]);
features->pressure_max = get_unaligned_le16(&data[11]);
features->fw_version = get_unaligned_le16(&data[13]);
+ if (features->generation) {
+ features->distance_max = data[16];
+ features->tilt_x_max = get_unaligned_le16(&data[17]);
+ features->tilt_y_max = get_unaligned_le16(&data[19]);
+ } else {
+ features->distance_max = -1;
+ features->tilt_x_max = -1;
+ features->tilt_y_max = -1;
+ }
dev_dbg(&client->dev,
"x_max:%d, y_max:%d, pressure:%d, fw:%d\n",
@@ -161,6 +173,7 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
u8 *data = wac_i2c->data;
unsigned int x, y, pressure;
unsigned char tsw, f1, f2, ers;
+ short tilt_x, tilt_y, distance;
int error;
error = i2c_master_recv(wac_i2c->client,
@@ -176,6 +189,12 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
y = le16_to_cpup((__le16 *)&data[6]);
pressure = le16_to_cpup((__le16 *)&data[8]);
+ /* Signed */
+ tilt_x = get_unaligned_le16(&data[11]);
+ tilt_y = get_unaligned_le16(&data[13]);
+
+ distance = get_unaligned_le16(&data[15]);
+
if (!wac_i2c->prox)
wac_i2c->tool = (data[3] & 0x0c) ?
BTN_TOOL_RUBBER : BTN_TOOL_PEN;
@@ -191,6 +210,9 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
input_report_abs(input, ABS_X, x);
input_report_abs(input, ABS_Y, y);
input_report_abs(input, ABS_PRESSURE, pressure);
+ input_report_abs(input, ABS_DISTANCE, distance);
+ input_report_abs(input, ABS_TILT_X, tilt_x);
+ input_report_abs(input, ABS_TILT_Y, tilt_y);
input_sync(input);
out:
@@ -266,7 +288,11 @@ static int wacom_i2c_probe(struct i2c_client *client,
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);
-
+ input_set_abs_params(input, ABS_DISTANCE, 0, features->distance_max, 0, 0);
+ input_set_abs_params(input, ABS_TILT_X, -features->tilt_x_max,
+ features->tilt_x_max, 0, 0);
+ input_set_abs_params(input, ABS_TILT_Y, -features->tilt_y_max,
+ features->tilt_y_max, 0, 0);
input_set_drvdata(input, wac_i2c);
error = devm_request_threaded_irq(dev, client->irq, NULL, wacom_i2c_irq,
Add support for the distance and tilt x/y. This is based on the out of tree rM2 driver. Signed-off-by: Alistair Francis <alistair@alistair23.me> --- drivers/input/touchscreen/wacom_i2c.c | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)