Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-16 10:45:04 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-16 10:45:14 +0200
commit2595c7f6e10b81e49fa9ca0765ed6963381a1fe0 (patch)
tree1fbeb300ea207947d98e23b7064d52184d467449
parent1f2823a3c3e94014aa33a690469af5e917391df7 (diff)
HID: wacom: Add support for Pro Pen slim (bsc#1051510).
-rw-r--r--patches.drivers/HID-wacom-Add-support-for-Pro-Pen-slim.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.drivers/HID-wacom-Add-support-for-Pro-Pen-slim.patch b/patches.drivers/HID-wacom-Add-support-for-Pro-Pen-slim.patch
new file mode 100644
index 0000000000..c52d3057d2
--- /dev/null
+++ b/patches.drivers/HID-wacom-Add-support-for-Pro-Pen-slim.patch
@@ -0,0 +1,45 @@
+From 4e6e7d7252745ff589a5b02834c1b228d2c9140f Mon Sep 17 00:00:00 2001
+From: Jason Gerecke <killertofu@gmail.com>
+Date: Tue, 19 Feb 2019 17:58:56 +0000
+Subject: [PATCH] HID: wacom: Add support for Pro Pen slim
+Git-commit: 4e6e7d7252745ff589a5b02834c1b228d2c9140f
+Patch-mainline: v5.1-rc1
+References: bsc#1051510
+
+Wacom has introduced a new pen compatible with its MobileStudio Pro and
+other tablets. Although adding it to the tool ID tablet is not strictly
+necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless
+the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead),
+we'll keep it updated anyway.
+
+Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/hid/wacom_wac.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
+index 5ecda99bf431..747730d32ab6 100644
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id)
+ case 0x8e2: /* IntuosHT2 pen */
+ case 0x022:
+ case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */
++ case 0x10842: /* MobileStudio Pro Pro Pen slim */
+ case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */
+ case 0x16802: /* Cintiq 13HD Pro Pen */
+ case 0x18802: /* DTH2242 Pen */
+@@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id)
+ case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */
+ case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */
+ case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */
++ case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */
+ case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */
+ case 0x1880a: /* DTH2242 Eraser */
+ case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index bed0627d32..98b4c67868 100644
--- a/series.conf
+++ b/series.conf
@@ -21578,6 +21578,7 @@
patches.drivers/HID-intel-ish-hid-avoid-binding-wrong-ishtp_cl_devic.patch
patches.drivers/HID-wacom-Move-HID-fix-for-AES-serial-number-into-wa.patch
patches.drivers/HID-wacom-Mark-expected-switch-fall-through.patch
+ patches.drivers/HID-wacom-Add-support-for-Pro-Pen-slim.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-mp5-nbio-and-pcie-smca-bank-types.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-mcatypes-for-cs-psp-and-smu-units.patch
patches.arch/x86-mce-amd-edac-mce_amd-add-new-error-descriptions-for-some-smca-bank-types.patch