diff options
-rw-r--r-- | drivers/hid/wacom_wac.c | 7 | ||||
-rw-r--r-- | drivers/hid/wacom_wac.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index a8a19a5ccee5..b65e0d7cd7e5 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c | |||
@@ -1847,6 +1847,7 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len) | |||
1847 | break; | 1847 | break; |
1848 | 1848 | ||
1849 | case DTUS: | 1849 | case DTUS: |
1850 | case DTUSX: | ||
1850 | sync = wacom_dtus_irq(wacom_wac); | 1851 | sync = wacom_dtus_irq(wacom_wac); |
1851 | break; | 1852 | break; |
1852 | 1853 | ||
@@ -2211,6 +2212,7 @@ int wacom_setup_pentouch_input_capabilities(struct input_dev *input_dev, | |||
2211 | /* fall through */ | 2212 | /* fall through */ |
2212 | 2213 | ||
2213 | case DTUS: | 2214 | case DTUS: |
2215 | case DTUSX: | ||
2214 | case PL: | 2216 | case PL: |
2215 | case DTU: | 2217 | case DTU: |
2216 | __set_bit(BTN_TOOL_PEN, input_dev->keybit); | 2218 | __set_bit(BTN_TOOL_PEN, input_dev->keybit); |
@@ -2722,6 +2724,10 @@ static const struct wacom_features wacom_features_0xFB = | |||
2722 | { "Wacom DTU1031", 22096, 13960, 511, 0, | 2724 | { "Wacom DTU1031", 22096, 13960, 511, 0, |
2723 | DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, | 2725 | DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, |
2724 | WACOM_DTU_OFFSET, WACOM_DTU_OFFSET }; | 2726 | WACOM_DTU_OFFSET, WACOM_DTU_OFFSET }; |
2727 | static const struct wacom_features wacom_features_0x32F = | ||
2728 | { "Wacom DTU1031X", 22472, 12728, 511, 0, | ||
2729 | DTUSX, WACOM_INTUOS_RES, WACOM_INTUOS_RES, | ||
2730 | WACOM_DTU_OFFSET, WACOM_DTU_OFFSET }; | ||
2725 | static const struct wacom_features wacom_features_0x57 = | 2731 | static const struct wacom_features wacom_features_0x57 = |
2726 | { "Wacom DTK2241", 95640, 54060, 2047, 63, | 2732 | { "Wacom DTK2241", 95640, 54060, 2047, 63, |
2727 | DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, | 2733 | DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, |
@@ -3057,6 +3063,7 @@ const struct hid_device_id wacom_ids[] = { | |||
3057 | { USB_DEVICE_WACOM(0x315) }, | 3063 | { USB_DEVICE_WACOM(0x315) }, |
3058 | { USB_DEVICE_WACOM(0x317) }, | 3064 | { USB_DEVICE_WACOM(0x317) }, |
3059 | { USB_DEVICE_WACOM(0x323) }, | 3065 | { USB_DEVICE_WACOM(0x323) }, |
3066 | { USB_DEVICE_WACOM(0x32F) }, | ||
3060 | { USB_DEVICE_WACOM(0x4001) }, | 3067 | { USB_DEVICE_WACOM(0x4001) }, |
3061 | { USB_DEVICE_WACOM(0x4004) }, | 3068 | { USB_DEVICE_WACOM(0x4004) }, |
3062 | { USB_DEVICE_WACOM(0x5000) }, | 3069 | { USB_DEVICE_WACOM(0x5000) }, |
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 128cbb337ff6..5384043778fc 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h | |||
@@ -80,6 +80,7 @@ enum { | |||
80 | PL, | 80 | PL, |
81 | DTU, | 81 | DTU, |
82 | DTUS, | 82 | DTUS, |
83 | DTUSX, | ||
83 | INTUOS, | 84 | INTUOS, |
84 | INTUOS3S, | 85 | INTUOS3S, |
85 | INTUOS3, | 86 | INTUOS3, |