[kernel/f20] Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)

[Josh Boyer]

commit 0b76b87d527f5d0a71354b7e291f76a5bd4b295c
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Thu Sep 4 08:47:53 2014 -0400

    Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)

 ...acom-Add-support-for-the-Cintiq-Companion.patch |   46 ++++++++++++++++++++
 kernel.spec                                        |    9 ++++
 2 files changed, 55 insertions(+), 0 deletions(-)
---
diff --git a/Input-wacom-Add-support-for-the-Cintiq-Companion.patch b/Input-wacom-Add-support-for-the-Cintiq-Companion.patch
new file mode 100644
index 0000000..33691cc
--- /dev/null
+++ b/Input-wacom-Add-support-for-the-Cintiq-Companion.patch
@@ -0,0 +1,46 @@
+From bdfffc320102278edac2db5a397ffbfd89faeab3 Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires at redhat.com>
+Date: Wed, 3 Sep 2014 15:43:25 -0400
+Subject: [PATCH] Input: 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 at redhat.com>
+---
+ drivers/input/tablet/wacom_wac.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
+index e73cf2c71f35..7f6caf8c85fb 100644
+--- a/drivers/input/tablet/wacom_wac.c
++++ b/drivers/input/tablet/wacom_wac.c
+@@ -2332,6 +2332,13 @@ static const struct wacom_features wacom_features_0x0307 =
+ static const struct wacom_features wacom_features_0x0309 =
+ 	{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
+ 	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10 };
++static const struct wacom_features wacom_features_0x030A =
++        { "Wacom ISDv5 30A", WACOM_PKGLEN_INTUOS,  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_0x030C =
++	{ "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
++	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x030A, .touch_max = 10 };
+ 
+ #define USB_DEVICE_WACOM(prod)					\
+ 	USB_DEVICE(USB_VENDOR_ID_WACOM, prod),			\
+@@ -2478,6 +2485,8 @@ const struct usb_device_id wacom_ids[] = {
+ 	{ USB_DEVICE_WACOM(0xFA) },
+ 	{ USB_DEVICE_WACOM(0xFB) },
+ 	{ USB_DEVICE_WACOM(0x0307) },
++	{ USB_DEVICE_WACOM(0x030A) },
++        { USB_DEVICE_DETAILED(0x030C, USB_CLASS_HID, 0, 0) },
+ 	{ USB_DEVICE_DETAILED(0x0309, USB_CLASS_HID, 0, 0) },
+ 	{ USB_DEVICE_LENOVO(0x6004) },
+ 	{ }
+-- 
+1.9.3
+
diff --git a/kernel.spec b/kernel.spec
index 2ca8323..a272e0e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -768,6 +768,9 @@ Patch26017: isofs-Fix-unbounded-recursion-when-processing-relocated-directories.
 #rhbz 1132786
 Patch26018: NFSv3-Fix-another-acl-regression.patch
 
+#rhbz 1134969
+Patch26019: Input-wacom-Add-support-for-the-Cintiq-Companion.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1494,6 +1497,9 @@ ApplyPatch isofs-Fix-unbounded-recursion-when-processing-relocated-directories.p
 #rhbz 1132786
 ApplyPatch NFSv3-Fix-another-acl-regression.patch
 
+#rhbz 1134969
+ApplyPatch Input-wacom-Add-support-for-the-Cintiq-Companion.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2305,6 +2311,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Sep 04 2014 Josh Boyer <jwboyer at fedoraproject.org>
+- Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)
+
 * Thu Aug 28 2014 Josh Boyer <jwboyer at fedoraproject.org>
 - Fix NFSv3 ACL regression (rhbz 1132786)
 - Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)