|
 |
52fafd4 |
From bdfffc320102278edac2db5a397ffbfd89faeab3 Mon Sep 17 00:00:00 2001
|
|
|
52fafd4 |
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
|
52fafd4 |
Date: Wed, 3 Sep 2014 15:43:25 -0400
|
|
|
52fafd4 |
Subject: [PATCH] Input: wacom: Add support for the Cintiq Companion
|
|
|
52fafd4 |
|
|
|
52fafd4 |
The Wacom Cintiq Companion shares the same sensor than the Cintiq
|
|
|
52fafd4 |
Companion Hybrid, with the exception of the different PIDs.
|
|
|
52fafd4 |
|
|
|
52fafd4 |
Bugzilla: 1134969
|
|
|
52fafd4 |
Upstream-status: Queued for 3.18
|
|
|
52fafd4 |
|
|
|
52fafd4 |
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
|
52fafd4 |
---
|
|
|
52fafd4 |
drivers/input/tablet/wacom_wac.c | 9 +++++++++
|
|
|
52fafd4 |
1 file changed, 9 insertions(+)
|
|
|
52fafd4 |
|
|
|
52fafd4 |
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
|
|
|
52fafd4 |
index e73cf2c71f35..7f6caf8c85fb 100644
|
|
|
52fafd4 |
--- a/drivers/input/tablet/wacom_wac.c
|
|
|
52fafd4 |
+++ b/drivers/input/tablet/wacom_wac.c
|
|
|
52fafd4 |
@@ -2332,6 +2332,13 @@ static const struct wacom_features wacom_features_0x0307 =
|
|
|
52fafd4 |
static const struct wacom_features wacom_features_0x0309 =
|
|
|
52fafd4 |
{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
|
|
|
52fafd4 |
.oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10 };
|
|
|
52fafd4 |
+static const struct wacom_features wacom_features_0x030A =
|
|
|
52fafd4 |
+ { "Wacom ISDv5 30A", WACOM_PKGLEN_INTUOS, 59352, 33648, 2047,
|
|
|
52fafd4 |
+ 63, CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
|
|
|
52fafd4 |
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };
|
|
|
52fafd4 |
+static const struct wacom_features wacom_features_0x030C =
|
|
|
52fafd4 |
+ { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
|
|
|
52fafd4 |
+ .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x030A, .touch_max = 10 };
|
|
|
52fafd4 |
|
|
|
52fafd4 |
#define USB_DEVICE_WACOM(prod) \
|
|
|
52fafd4 |
USB_DEVICE(USB_VENDOR_ID_WACOM, prod), \
|
|
|
52fafd4 |
@@ -2478,6 +2485,8 @@ const struct usb_device_id wacom_ids[] = {
|
|
|
52fafd4 |
{ USB_DEVICE_WACOM(0xFA) },
|
|
|
52fafd4 |
{ USB_DEVICE_WACOM(0xFB) },
|
|
|
52fafd4 |
{ USB_DEVICE_WACOM(0x0307) },
|
|
|
52fafd4 |
+ { USB_DEVICE_WACOM(0x030A) },
|
|
|
52fafd4 |
+ { USB_DEVICE_DETAILED(0x030C, USB_CLASS_HID, 0, 0) },
|
|
|
52fafd4 |
{ USB_DEVICE_DETAILED(0x0309, USB_CLASS_HID, 0, 0) },
|
|
|
52fafd4 |
{ USB_DEVICE_LENOVO(0x6004) },
|
|
|
52fafd4 |
{ }
|
|
|
52fafd4 |
--
|
|
|
52fafd4 |
1.9.3
|
|
|
52fafd4 |
|