2014-10-01 14:09:16 +00:00
|
|
|
From a8bb37b78fcbda02cd09fc2dabdb3f6366f6817d Mon Sep 17 00:00:00 2001
|
2014-09-04 13:34:41 +00:00
|
|
|
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
|
|
|
Date: Wed, 3 Sep 2014 15:43:25 -0400
|
|
|
|
|
Subject: [PATCH] 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.
|
|
|
|
|
|
|
|
|
|
Bugzilla: 1134969
|
|
|
|
|
Upstream-status: Queued for 3.18
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/hid/wacom_wac.c | 10 ++++++++++
|
|
|
|
|
1 file changed, 10 insertions(+)
|
|
|
|
|
|
|
|
|
|
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 =
|
|
|
|
|
{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
|
|
|
|
|
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,
|
|
|
|
|
.check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
|
|
|
|
|
+static const struct wacom_features wacom_features_0x30A =
|
|
|
|
|
+ { "Wacom ISDv5 30A", 59352, 33648, 2047, 63,
|
|
|
|
|
+ CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
|
|
|
|
|
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };
|
|
|
|
|
+static const struct wacom_features wacom_features_0x30C =
|
|
|
|
|
+ { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
|
|
|
|
|
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
|
|
|
|
|
+ .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
|
|
|
|
|
|
|
|
|
|
#define USB_DEVICE_WACOM(prod) \
|
|
|
|
|
HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\
|
|
|
|
|
@@ -2708,6 +2716,8 @@ const struct hid_device_id wacom_ids[] = {
|
|
|
|
|
{ USB_DEVICE_WACOM(0x304) },
|
|
|
|
|
{ USB_DEVICE_WACOM(0x307) },
|
|
|
|
|
{ USB_DEVICE_WACOM(0x309) },
|
|
|
|
|
+ { USB_DEVICE_WACOM(0x30A) },
|
|
|
|
|
+ { USB_DEVICE_WACOM(0x30C) },
|
|
|
|
|
{ USB_DEVICE_WACOM(0x30E) },
|
|
|
|
|
{ USB_DEVICE_WACOM(0x314) },
|
|
|
|
|
{ USB_DEVICE_WACOM(0x315) },
|
|
|
|
|
--
|
|
|
|
|
1.9.3
|
|
|
|
|
|
