rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for Wacom tablet (rhbz 1539238)

This commit is contained in:
Laura Abbott 2018-01-27 07:06:32 -08:00
parent 491a1253d8
commit 612b57af7c
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Add-support-for-One-by-Wacom-CTL-472-CTL-672.patch Normal file
View File

@ -0,0 +1,51 @@
From patchwork Tue Dec 26 23:50:18 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Add support for One by Wacom (CTL-472 / CTL-672)
From: Jason Gerecke <killertofu@gmail.com>
X-Patchwork-Id: 10133291
Message-Id: <20171226235018.5522-1-killertofu@gmail.com>
To: linux-input@vger.kernel.org, Jiri Kosina <jkosina@suse.cz>,
Mx Jing <jingmingxuan@outlook.com>
Cc: Ping Cheng <pinglinux@gmail.com>, Aaron Skomra <skomra@gmail.com>,
Jason Gerecke <killertofu@gmail.com>,
Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 26 Dec 2017 15:50:18 -0800
Adds support for the second-generation "One by Wacom" tablets. These
devices are similar to the last generation, but a slightly different size
and reporting a higher number of pressure levels.
Signed-off-by: Mx Jing <jingmingxuan@outlook.com>
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
drivers/hid/wacom_wac.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index aa692e28b2cd..5f932ddcdc49 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -4376,6 +4376,12 @@ static const struct wacom_features wacom_features_0x360 =
static const struct wacom_features wacom_features_0x361 =
{ "Wacom Intuos Pro L", 62200, 43200, 8191, 63,
INTUOSP2_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 10 };
+static const struct wacom_features wacom_features_0x37A =
+ { "Wacom One by Wacom S", 15200, 9500, 2047, 63,
+ BAMBOO_PEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x37B =
+ { "Wacom One by Wacom M", 21600, 13500, 2047, 63,
+ BAMBOO_PEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
static const struct wacom_features wacom_features_HID_ANY_ID =
{ "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID };
@@ -4544,6 +4550,8 @@ const struct hid_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x343) },
{ BT_DEVICE_WACOM(0x360) },
{ BT_DEVICE_WACOM(0x361) },
+ { USB_DEVICE_WACOM(0x37A) },
+ { USB_DEVICE_WACOM(0x37B) },
{ USB_DEVICE_WACOM(0x4001) },
{ USB_DEVICE_WACOM(0x4004) },
{ USB_DEVICE_WACOM(0x5000) },

6
kernel.spec
View File

@ -677,6 +677,9 @@ Patch633: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch
# Fix crash on Xwayland using nouveau
Patch634: dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch
# rhbz 1539238
Patch635: Add-support-for-One-by-Wacom-CTL-472-CTL-672.patch
# END OF PATCH DEFINITIONS
%endif
@ -2234,6 +2237,9 @@ fi
#
#
%changelog
* Sat Jan 27 2018 Laura Abbott <labbott@fedoraproject.org>
- Add support for Wacom tablet (rhbz 1539238)
* Fri Jan 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.15-301
- Revert retpoline vermagic tag