zwp10758 / rpms / kernel

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