145 lines
6.7 KiB
Diff
145 lines
6.7 KiB
Diff
|
From 0ba33cc0e4f65bfc9250027f810e2a78e251bb92 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Day <jake@ninebysix.com>
|
||
|
|
Date: Sun, 27 Jan 2019 10:52:52 -0500
|
||
|
|
Subject: [PATCH 06/11] hid
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/hid/hid-ids.h | 20 ++++++++++----
|
||
|
|
drivers/hid/hid-microsoft.c | 3 ++-
|
||
|
|
drivers/hid/hid-multitouch.c | 52 ++++++++++++++++++++++++++++++++++++
|
||
|
|
drivers/hid/hid-quirks.c | 10 +++++++
|
||
|
|
4 files changed, 79 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||
|
|
index b7870e7e41d4..2ad517f1c1fe 100644
|
||
|
|
--- a/drivers/hid/hid-ids.h
|
||
|
|
+++ b/drivers/hid/hid-ids.h
|
||
|
|
@@ -800,11 +800,21 @@
|
||
|
|
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
|
||
|
|
#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750
|
||
|
|
#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c
|
||
|
|
-#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
|
||
|
|
-#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
|
||
|
|
-#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
|
||
|
|
-#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
|
||
|
|
-#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||
|
|
+#define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3
|
||
|
|
+#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
|
||
|
|
+#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1 0x07de
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e8
|
||
|
|
+#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1 0x07e4
|
||
|
|
+#define USB_DEVICE_ID_MS_SURFACE_BOOK 0x07cd
|
||
|
|
+#define USB_DEVICE_ID_MS_SURFACE_BOOK_2 0x0922
|
||
|
|
+#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
|
||
|
|
+#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||
|
|
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
|
||
|
|
|
||
|
|
#define USB_VENDOR_ID_MOJO 0x8282
|
||
|
|
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
|
||
|
|
index 72d983626afd..133395b45022 100644
|
||
|
|
--- a/drivers/hid/hid-microsoft.c
|
||
|
|
+++ b/drivers/hid/hid-microsoft.c
|
||
|
|
@@ -313,7 +313,8 @@ static const struct hid_device_id ms_devices[] = {
|
||
|
|
.driver_data = MS_HIDINPUT },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
|
||
|
|
.driver_data = MS_ERGONOMY},
|
||
|
|
-
|
||
|
|
+ { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF),
|
||
|
|
+ .driver_data = MS_HIDINPUT},
|
||
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
|
||
|
|
.driver_data = MS_PRESENTER },
|
||
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
|
||
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||
|
|
index 831617c386e6..1953d21398cf 100644
|
||
|
|
--- a/drivers/hid/hid-multitouch.c
|
||
|
|
+++ b/drivers/hid/hid-multitouch.c
|
||
|
|
@@ -1978,6 +1978,58 @@ static const struct hid_device_id mt_devices[] = {
|
||
|
|
HID_USB_DEVICE(USB_VENDOR_ID_LG,
|
||
|
|
USB_DEVICE_ID_LG_MELFAS_MT) },
|
||
|
|
|
||
|
|
+ /* Microsoft Touch Cover */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TOUCH_COVER_2) },
|
||
|
|
+
|
||
|
|
+ /* Microsoft Type Cover */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_2) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_3) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1) },
|
||
|
|
+
|
||
|
|
+ /* Microsoft Surface Book */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_SURFACE_BOOK) },
|
||
|
|
+
|
||
|
|
+ /* Microsoft Surface Book 2 */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
|
||
|
|
+
|
||
|
|
+ /* Microsoft Surface Laptop */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||
|
|
+ USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_SURFACE_VHF) },
|
||
|
|
+
|
||
|
|
+ /* Microsoft Power Cover */
|
||
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
||
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
||
|
|
+ USB_DEVICE_ID_MS_POWER_COVER) },
|
||
|
|
+
|
||
|
|
/* MosArt panels */
|
||
|
|
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
|
||
|
|
MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
|
||
|
|
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
|
||
|
|
index 77316f022c5a..2d4aafb92d85 100644
|
||
|
|
--- a/drivers/hid/hid-quirks.c
|
||
|
|
+++ b/drivers/hid/hid-quirks.c
|
||
|
|
@@ -111,6 +111,16 @@ static const struct hid_device_id hid_quirks[] = {
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_1), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
+ { HID_DEVICE(BUS_VIRTUAL, 0, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_VHF), HID_QUIRK_ALWAYS_POLL },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
|
||
|
|
{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|