diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-09-03 15:43:25 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-09-03 17:42:53 -0400 |
commit | 89f2ab55ea0292bbdf07e5e0b3266ebf0018a224 (patch) | |
tree | 201ea9bfb9dc9790545bcc77a6850c93a2a56f36 | |
parent | ff0c57ac70434bc936cb0110eaf033a0a1a62e52 (diff) |
HID: wacom: Add support for the Cintiq Companion
The Wacom Cintiq Companion shares the same sensor than the Cintiq
Companion Hybrid, with the exception of the different PIDs.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/wacom_wac.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index aa6a08eb7ad6..c3cbbfb5811f 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c | |||
@@ -2573,6 +2573,14 @@ static const struct wacom_features wacom_features_0x309 = | |||
2573 | { "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */ | 2573 | { "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */ |
2574 | .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10, | 2574 | .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10, |
2575 | .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; | 2575 | .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; |
2576 | static const struct wacom_features wacom_features_0x30A = | ||
2577 | { "Wacom ISDv5 30A", 59352, 33648, 2047, 63, | ||
2578 | CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200, | ||
2579 | .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C }; | ||
2580 | static const struct wacom_features wacom_features_0x30C = | ||
2581 | { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */ | ||
2582 | .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10, | ||
2583 | .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE }; | ||
2576 | 2584 | ||
2577 | #define USB_DEVICE_WACOM(prod) \ | 2585 | #define USB_DEVICE_WACOM(prod) \ |
2578 | HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ | 2586 | HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ |
@@ -2708,6 +2716,8 @@ const struct hid_device_id wacom_ids[] = { | |||
2708 | { USB_DEVICE_WACOM(0x304) }, | 2716 | { USB_DEVICE_WACOM(0x304) }, |
2709 | { USB_DEVICE_WACOM(0x307) }, | 2717 | { USB_DEVICE_WACOM(0x307) }, |
2710 | { USB_DEVICE_WACOM(0x309) }, | 2718 | { USB_DEVICE_WACOM(0x309) }, |
2719 | { USB_DEVICE_WACOM(0x30A) }, | ||
2720 | { USB_DEVICE_WACOM(0x30C) }, | ||
2711 | { USB_DEVICE_WACOM(0x30E) }, | 2721 | { USB_DEVICE_WACOM(0x30E) }, |
2712 | { USB_DEVICE_WACOM(0x314) }, | 2722 | { USB_DEVICE_WACOM(0x314) }, |
2713 | { USB_DEVICE_WACOM(0x315) }, | 2723 | { USB_DEVICE_WACOM(0x315) }, |