2018-06-07 21:58:39 +00:00
|
|
|
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
2018-06-28 22:19:09 +00:00
|
|
|
index 46f5ecd11bf7..cceb745d2805 100644
|
2018-06-07 21:58:39 +00:00
|
|
|
--- a/drivers/hid/hid-ids.h
|
|
|
|
+++ b/drivers/hid/hid-ids.h
|
2018-06-28 22:19:09 +00:00
|
|
|
@@ -791,11 +791,21 @@
|
2018-06-07 21:58:39 +00:00
|
|
|
#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_LAPTOP 0xf001
|
|
|
|
+#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
|
|
|
|
|
|
|
#define USB_VENDOR_ID_MOJO 0x8282
|
|
|
|
#define USB_DEVICE_ID_RETRO_ADAPTER 0x3201
|
2018-06-28 22:19:09 +00:00
|
|
|
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
|
|
|
|
index 96e7d3231d2f..e55097221eec 100644
|
|
|
|
--- a/drivers/hid/hid-microsoft.c
|
|
|
|
+++ b/drivers/hid/hid-microsoft.c
|
|
|
|
@@ -278,7 +278,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_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP),
|
|
|
|
+ .driver_data = MS_HIDINPUT},
|
|
|
|
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
|
|
|
|
.driver_data = MS_PRESENTER },
|
|
|
|
{ }
|
2018-06-07 21:58:39 +00:00
|
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
2018-06-28 22:19:09 +00:00
|
|
|
index 1e561872a17f..8b7509ed5775 100644
|
2018-06-07 21:58:39 +00:00
|
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
|
|
@@ -1744,6 +1744,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,
|
2018-06-28 22:19:09 +00:00
|
|
|
+ USB_DEVICE_ID_MS_SURFACE_LAPTOP) },
|
2018-06-07 21:58:39 +00:00
|
|
|
+
|
|
|
|
+ /* 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
|
2018-06-28 22:19:09 +00:00
|
|
|
index 587e2681a53f..4a5e335006d7 100644
|
2018-06-07 21:58:39 +00:00
|
|
|
--- 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 },
|
2018-06-28 22:19:09 +00:00
|
|
|
+ { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP), HID_QUIRK_ALWAYS_POLL },
|
2018-06-07 21:58:39 +00:00
|
|
|
{ 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 },
|