|
@@ -1,20 +1,20 @@
|
|
|
-From 7ca1ed7d248ac352163159c884049b33ac3f9db1 Mon Sep 17 00:00:00 2001
|
|
|
+From 9d849efa4cfe9459b6518de9247f765883245983 Mon Sep 17 00:00:00 2001
|
|
|
From: Jake Day <jake@ninebysix.com>
|
|
|
-Date: Thu, 31 Jan 2019 07:11:43 -0500
|
|
|
+Date: Thu, 7 Feb 2019 07:27:09 -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(-)
|
|
|
+ drivers/hid/hid-ids.h | 21 +++++++++----
|
|
|
+ drivers/hid/hid-microsoft.c | 3 +-
|
|
|
+ drivers/hid/hid-multitouch.c | 57 ++++++++++++++++++++++++++++++++++++
|
|
|
+ drivers/hid/hid-quirks.c | 11 +++++++
|
|
|
+ 4 files changed, 86 insertions(+), 6 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
|
|
-index b7870e7e41d4..2ad517f1c1fe 100644
|
|
|
+index b7870e7e41d4..5e6e81340be8 100644
|
|
|
--- a/drivers/hid/hid-ids.h
|
|
|
+++ b/drivers/hid/hid-ids.h
|
|
|
-@@ -800,11 +800,21 @@
|
|
|
+@@ -800,11 +800,22 @@
|
|
|
#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
|
|
@@ -36,6 +36,7 @@ index b7870e7e41d4..2ad517f1c1fe 100644
|
|
|
+#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_GO 0x096f
|
|
|
+#define USB_DEVICE_ID_MS_SURFACE_VHF 0xf001
|
|
|
+#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
|
|
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
|
|
@@ -56,10 +57,10 @@ index 72d983626afd..133395b45022 100644
|
|
|
.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
|
|
|
+index 831617c386e6..21337070068a 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[] = {
|
|
|
+@@ -1978,6 +1978,63 @@ static const struct hid_device_id mt_devices[] = {
|
|
|
HID_USB_DEVICE(USB_VENDOR_ID_LG,
|
|
|
USB_DEVICE_ID_LG_MELFAS_MT) },
|
|
|
|
|
@@ -104,6 +105,11 @@ index 831617c386e6..1953d21398cf 100644
|
|
|
+ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
|
|
+ USB_DEVICE_ID_MS_SURFACE_BOOK_2) },
|
|
|
+
|
|
|
++ /* Microsoft Surface Go */
|
|
|
++ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
|
|
++ MT_USB_DEVICE(USB_VENDOR_ID_MICROSOFT,
|
|
|
++ USB_DEVICE_ID_MS_SURFACE_GO) },
|
|
|
++
|
|
|
+ /* Microsoft Surface Laptop */
|
|
|
+ { .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
|
|
|
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
|
@@ -119,10 +125,10 @@ index 831617c386e6..1953d21398cf 100644
|
|
|
{ .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
|
|
|
+index 77316f022c5a..12b4e94232cc 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[] = {
|
|
|
+@@ -111,6 +111,17 @@ 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 },
|
|
@@ -135,6 +141,7 @@ index 77316f022c5a..2d4aafb92d85 100644
|
|
|
+ { 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_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_GO), 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 },
|