HID: wacom: Add support for DTU-1031X
authorPing Cheng <pinglinux@gmail.com>
Fri, 5 Dec 2014 02:23:04 +0000 (18:23 -0800)
committerJiri Kosina <jkosina@suse.cz>
Fri, 5 Dec 2014 21:34:15 +0000 (22:34 +0100)
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_wac.c
drivers/hid/wacom_wac.h

index a8a19a5ccee573b9ef84697919ba6694d84cacec..b65e0d7cd7e518cbb97a115280140b01d920f8d9 100644 (file)
@@ -1847,6 +1847,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
                break;
 
        case DTUS:
+       case DTUSX:
                sync = wacom_dtus_irq(wacom_wac);
                break;
 
@@ -2211,6 +2212,7 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev,
                /* fall through */
 
        case DTUS:
+       case DTUSX:
        case PL:
        case DTU:
                __set_bit(BTN_TOOL_PEN, input_dev->keybit);
@@ -2722,6 +2724,10 @@ static const struct wacom_features wacom_features_0xFB =
        { "Wacom DTU1031", 22096, 13960, 511, 0,
          DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
          WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
+static const struct wacom_features wacom_features_0x32F =
+       { "Wacom DTU1031X", 22472, 12728, 511, 0,
+         DTUSX, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+         WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
 static const struct wacom_features wacom_features_0x57 =
        { "Wacom DTK2241", 95640, 54060, 2047, 63,
          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
@@ -3057,6 +3063,7 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x315) },
        { USB_DEVICE_WACOM(0x317) },
        { USB_DEVICE_WACOM(0x323) },
+       { USB_DEVICE_WACOM(0x32F) },
        { USB_DEVICE_WACOM(0x4001) },
        { USB_DEVICE_WACOM(0x4004) },
        { USB_DEVICE_WACOM(0x5000) },
index 128cbb337ff6fd21db537fa50b7040cc89aed307..5384043778fcb1f29965afd4bcfa37c6b3b0b562 100644 (file)
@@ -80,6 +80,7 @@ enum {
        PL,
        DTU,
        DTUS,
+       DTUSX,
        INTUOS,
        INTUOS3S,
        INTUOS3,