1 files changed, 41 insertions, 27 deletions

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 08ba5ad9c9be..03ebcc8b24b5 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -15,6 +15,7 @@
 #include "wacom_wac.h"
 #include "wacom.h"
 #include <linux/input/mt.h>
+#include <linux/hid.h>
 
 /* resolution for penabled devices */
 #define WACOM_PL_RES            20
@@ -264,6 +265,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
                         wacom->id[0] = 0;
                 input_report_abs(input, ABS_MISC, wacom->id[0]); /* report tool id */
                 input_report_key(input, wacom->tool[0], prox);
+                input_event(input, EV_MSC, MSC_SERIAL, 1);
                 input_sync(input); /* sync last event */
         }
 
@@ -273,11 +275,10 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
                 prox = data[7] & 0xf8;
                 if (prox || wacom->id[1]) {
                         wacom->id[1] = PAD_DEVICE_ID;
-                        input_report_key(input, BTN_0, (data[7] & 0x40));
-                        input_report_key(input, BTN_4, (data[7] & 0x80));
+                        input_report_key(input, BTN_BACK, (data[7] & 0x40));
+                        input_report_key(input, BTN_FORWARD, (data[7] & 0x80));
                         rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3);
                         input_report_rel(input, REL_WHEEL, rw);
-                        input_report_key(input, BTN_TOOL_FINGER, 0xf0);
                         if (!prox)
                                 wacom->id[1] = 0;
                         input_report_abs(input, ABS_MISC, wacom->id[1]);
@@ -290,18 +291,17 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
                 prox = (data[7] & 0xf8) || data[8];
                 if (prox || wacom->id[1]) {
                         wacom->id[1] = PAD_DEVICE_ID;
-                        input_report_key(input, BTN_0, (data[7] & 0x08));
-                        input_report_key(input, BTN_1, (data[7] & 0x20));
-                        input_report_key(input, BTN_4, (data[7] & 0x10));
-                        input_report_key(input, BTN_5, (data[7] & 0x40));
+                        input_report_key(input, BTN_BACK, (data[7] & 0x08));
+                        input_report_key(input, BTN_LEFT, (data[7] & 0x20));
+                        input_report_key(input, BTN_FORWARD, (data[7] & 0x10));
+                        input_report_key(input, BTN_RIGHT, (data[7] & 0x40));
                         input_report_abs(input, ABS_WHEEL, (data[8] & 0x7f));
-                        input_report_key(input, BTN_TOOL_FINGER, 0xf0);
                         if (!prox)
                                 wacom->id[1] = 0;
                         input_report_abs(input, ABS_MISC, wacom->id[1]);
                         input_event(input, EV_MSC, MSC_SERIAL, 0xf0);
+                        retval = 1;
                 }
-                retval = 1;
                 break;
         }
 exit:
@@ -494,10 +494,6 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
 
         /* pad packets. Works as a second tool and is always in prox */
         if (data[0] == WACOM_REPORT_INTUOSPAD) {
-                /* initiate the pad as a device */
-                if (wacom->tool[1] != BTN_TOOL_FINGER)
-                        wacom->tool[1] = BTN_TOOL_FINGER;
-
                 if (features->type >= INTUOS4S && features->type <= INTUOS4L) {
                         input_report_key(input, BTN_0, (data[2] & 0x01));
                         input_report_key(input, BTN_1, (data[3] & 0x01));
@@ -1080,18 +1076,14 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
 
         switch (wacom_wac->features.type) {
         case WACOM_MO:
-                __set_bit(BTN_1, input_dev->keybit);
-                __set_bit(BTN_5, input_dev->keybit);
-
                 input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
                 /* fall through */
 
         case WACOM_G4:
                 input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
 
-                __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
-                __set_bit(BTN_0, input_dev->keybit);
-                __set_bit(BTN_4, input_dev->keybit);
+                __set_bit(BTN_BACK, input_dev->keybit);
+                __set_bit(BTN_FORWARD, input_dev->keybit);
                 /* fall through */
 
         case GRAPHIRE:
@@ -1127,10 +1119,12 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
         case CINTIQ:
                 for (i = 0; i < 8; i++)
                         __set_bit(BTN_0 + i, input_dev->keybit);
-                __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
 
-                input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
-                input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
+                if (wacom_wac->features.type != WACOM_21UX2) {
+                        input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
+                        input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
+                }
+
                 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
                 wacom_setup_cintiq(wacom_wac);
                 break;
@@ -1151,8 +1145,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
                 __set_bit(BTN_2, input_dev->keybit);
                 __set_bit(BTN_3, input_dev->keybit);
 
-                __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
-
                 input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
                 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
                 /* fall through */
@@ -1170,7 +1162,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
         case INTUOS4S:
                 for (i = 0; i < 7; i++)
                         __set_bit(BTN_0 + i, input_dev->keybit);
-                __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
 
                 input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
                 wacom_setup_intuos(wacom_wac);
@@ -1295,6 +1286,12 @@ static const struct wacom_features wacom_features_0x65 =
 static const struct wacom_features wacom_features_0x69 =
         { "Wacom Bamboo1",        WACOM_PKGLEN_GRAPHIRE,   5104,  3712,  511,
           63, GRAPHIRE, WACOM_PENPRTN_RES, WACOM_PENPRTN_RES };
+static const struct wacom_features wacom_features_0x6A =
+        { "Wacom Bamboo1 4x6",    WACOM_PKGLEN_GRAPHIRE,  14760,  9225, 1023,
+          63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x6B =
+        { "Wacom Bamboo1 5x8",    WACOM_PKGLEN_GRAPHIRE,  21648, 13530, 1023,
+          63, GRAPHIRE, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x20 =
         { "Wacom Intuos 4x5",     WACOM_PKGLEN_INTUOS,    12700, 10600, 1023,
           31, INTUOS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1427,6 +1424,9 @@ static const struct wacom_features wacom_features_0x90 =
 static const struct wacom_features wacom_features_0x93 =
         { "Wacom ISDv4 93",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x97 =
+        { "Wacom ISDv4 97",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  511,
+          0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x9A =
         { "Wacom ISDv4 9A",       WACOM_PKGLEN_GRAPHIRE,  26202, 16325,  255,
           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -1458,7 +1458,7 @@ static const struct wacom_features wacom_features_0xD3 =
         { "Wacom Bamboo 2FG 6x8", WACOM_PKGLEN_BBFUN,     21648, 13530, 1023,
           63, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD4 =
-        { "Wacom Bamboo Pen",     WACOM_PKGLEN_BBFUN,     14720,  9200,  255,
+        { "Wacom Bamboo Pen",     WACOM_PKGLEN_BBFUN,     14720,  9200, 1023,
           63, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xD6 =
         { "Wacom BambooPT 2FG 4x5", WACOM_PKGLEN_BBFUN,   14720,  9200, 1023,
@@ -1483,6 +1483,11 @@ static const struct wacom_features wacom_features_0x6004 =
         USB_DEVICE(USB_VENDOR_ID_WACOM, prod),                  \
         .driver_info = (kernel_ulong_t)&wacom_features_##prod
 
+#define USB_DEVICE_DETAILED(prod, class, sub, proto)                    \
+        USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_WACOM, prod, class, \
+                                      sub, proto),                      \
+        .driver_info = (kernel_ulong_t)&wacom_features_##prod
+
 #define USB_DEVICE_LENOVO(prod)                                 \
         USB_DEVICE(USB_VENDOR_ID_LENOVO, prod),                 \
         .driver_info = (kernel_ulong_t)&wacom_features_##prod
@@ -1506,6 +1511,8 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0x64) },
         { USB_DEVICE_WACOM(0x65) },
         { USB_DEVICE_WACOM(0x69) },
+        { USB_DEVICE_WACOM(0x6A) },
+        { USB_DEVICE_WACOM(0x6B) },
         { USB_DEVICE_WACOM(0x20) },
         { USB_DEVICE_WACOM(0x21) },
         { USB_DEVICE_WACOM(0x22) },
@@ -1545,7 +1552,13 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0xC5) },
         { USB_DEVICE_WACOM(0xC6) },
         { USB_DEVICE_WACOM(0xC7) },
-        { USB_DEVICE_WACOM(0xCE) },
+        /*
+         * DTU-2231 has two interfaces on the same configuration,
+         * only one is used.
+         */
+        { USB_DEVICE_DETAILED(0xCE, USB_CLASS_HID,
+                              USB_INTERFACE_SUBCLASS_BOOT,
+                              USB_INTERFACE_PROTOCOL_MOUSE) },
         { USB_DEVICE_WACOM(0xD0) },
         { USB_DEVICE_WACOM(0xD1) },
         { USB_DEVICE_WACOM(0xD2) },
@@ -1560,6 +1573,7 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0xCC) },
         { USB_DEVICE_WACOM(0x90) },
         { USB_DEVICE_WACOM(0x93) },
+        { USB_DEVICE_WACOM(0x97) },
         { USB_DEVICE_WACOM(0x9A) },
         { USB_DEVICE_WACOM(0x9F) },
         { USB_DEVICE_WACOM(0xE2) },