Input: wacom - add support for 0x116 sensor on Win8 Panasonic CF-H2

The Win8 version of the Panasonic CF-H2 includes a new Wacom device.
The pen interface appears to use the same protocol as before, but the
touch interface has been tweaked to send Win8-compatible reports.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 05f371df6c40..4ab4b09e3d35 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1051,6 +1051,10 @@ static int wacom_tpc_single_touch(struct wacom_wac *wacom, size_t len)
                         prox = data[0] & 0x01;
                         x = get_unaligned_le16(&data[1]);
                         y = get_unaligned_le16(&data[3]);
+                } else if (len == WACOM_PKGLEN_TPC1FG_B) {
+                        prox = data[2] & 0x01;
+                        x = get_unaligned_le16(&data[3]);
+                        y = get_unaligned_le16(&data[5]);
                 } else {
                         prox = data[1] & 0x01;
                         x = le16_to_cpup((__le16 *)&data[2]);
@@ -2242,6 +2246,9 @@ static const struct wacom_features wacom_features_0x10E =
 static const struct wacom_features wacom_features_0x10F =
         { "Wacom ISDv4 10F",      WACOM_PKGLEN_MTTPC,     27760, 15694,  255,
           0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x116 =
+        { "Wacom ISDv4 116",      WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
+          0, TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x4001 =
         { "Wacom ISDv4 4001",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
           0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2456,6 +2463,7 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0x10D) },
         { USB_DEVICE_WACOM(0x10E) },
         { USB_DEVICE_WACOM(0x10F) },
+        { USB_DEVICE_WACOM(0x116) },
         { USB_DEVICE_WACOM(0x300) },
         { USB_DEVICE_WACOM(0x301) },
         { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index f69c0ebe7fa9..a066dc00989f 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -22,6 +22,7 @@
 #define WACOM_PKGLEN_BBFUN       9
 #define WACOM_PKGLEN_INTUOS     10
 #define WACOM_PKGLEN_TPC1FG      5
+#define WACOM_PKGLEN_TPC1FG_B   10
 #define WACOM_PKGLEN_TPC2FG     14
 #define WACOM_PKGLEN_BBTOUCH    20
 #define WACOM_PKGLEN_BBTOUCH3   64