aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2014-07-28 13:53:16 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-28 13:56:50 -0400
commitaeaf50d4e7d29d9a5f6da45fdcd9fb118f70fb93 (patch)
treeb423c2bbd084f5fb974206d58a18363dd221f81f
parent7dbd229e10603b3759f366007df2068dc2acfe46 (diff)
Input: wacom - add support for 0x12C ISDv4 sensor
Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/hid/wacom_wac.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index cfd2ae13c287..71646b311867 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2332,6 +2332,9 @@ static const struct wacom_features wacom_features_0x10F =
2332static const struct wacom_features wacom_features_0x116 = 2332static const struct wacom_features wacom_features_0x116 =
2333 { "Wacom ISDv4 116", 26202, 16325, 255, 0, 2333 { "Wacom ISDv4 116", 26202, 16325, 255, 0,
2334 TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; 2334 TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
2335static const struct wacom_features wacom_features_0x12C =
2336 { "Wacom ISDv4 12C", 27848, 15752, 2047, 0,
2337 TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
2335static const struct wacom_features wacom_features_0x4001 = 2338static const struct wacom_features wacom_features_0x4001 =
2336 { "Wacom ISDv4 4001", 26202, 16325, 255, 0, 2339 { "Wacom ISDv4 4001", 26202, 16325, 255, 0,
2337 MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; 2340 MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2542,6 +2545,7 @@ const struct hid_device_id wacom_ids[] = {
2542 { USB_DEVICE_WACOM(0x10E) }, 2545 { USB_DEVICE_WACOM(0x10E) },
2543 { USB_DEVICE_WACOM(0x10F) }, 2546 { USB_DEVICE_WACOM(0x10F) },
2544 { USB_DEVICE_WACOM(0x116) }, 2547 { USB_DEVICE_WACOM(0x116) },
2548 { USB_DEVICE_WACOM(0x12C) },
2545 { USB_DEVICE_WACOM(0x300) }, 2549 { USB_DEVICE_WACOM(0x300) },
2546 { USB_DEVICE_WACOM(0x301) }, 2550 { USB_DEVICE_WACOM(0x301) },
2547 { USB_DEVICE_WACOM(0x302) }, 2551 { USB_DEVICE_WACOM(0x302) },