tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
HID: multitouch: enable Surface 3 Type Cover Pro to report multitouch data
Nearly identical to the previous set of patches related to Microsoft
Surface Keyboards.
Removes Surface Pro 3 generation TypeCover support from hid-microsoft
so proper multitouch data can be reported from the touchpad.
Signed-off-by: Dennis Chen <barracks510@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
authored by
Dennis Chen
and committed by
Jiri Kosina
0a76ac80
66e5c5ff
+1
-19
+1
-7
drivers/hid/hid-core.c
+1
-7
drivers/hid/hid-core.c
···
724
724
hid->group = HID_GROUP_SENSOR_HUB;
725
725
726
726
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
727
-
(hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
728
-
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
729
-
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
730
-
hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
727
+
hid->product == USB_DEVICE_ID_MS_POWER_COVER &&
731
728
hid->group == HID_GROUP_MULTITOUCH)
732
729
hid->group = HID_GROUP_GENERIC;
733
730
···
1979
1982
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
1980
1983
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
1981
1984
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
1982
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
1983
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
1984
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
1985
1985
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
1986
1986
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
1987
1987
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
-3
drivers/hid/hid-ids.h
-3
drivers/hid/hid-ids.h
···
718
718
#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
719
719
#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
720
720
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
721
-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
722
-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
723
-
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
724
721
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
725
722
726
723
#define USB_VENDOR_ID_MOJO 0x8282
-6
drivers/hid/hid-microsoft.c
-6
drivers/hid/hid-microsoft.c
···
274
274
.driver_data = MS_NOGET },
275
275
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),
276
276
.driver_data = MS_DUPLICATE_USAGES },
277
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3),
278
-
.driver_data = MS_HIDINPUT },
279
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2),
280
-
.driver_data = MS_HIDINPUT },
281
-
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),
282
-
.driver_data = MS_HIDINPUT },
283
277
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),
284
278
.driver_data = MS_HIDINPUT },
285
279
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
-3
drivers/hid/usbhid/hid-quirks.c
-3
drivers/hid/usbhid/hid-quirks.c
···
100
100
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2, HID_QUIRK_NO_INIT_REPORTS },
101
101
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
102
102
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
103
-
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },
104
-
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
105
-
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },
106
103
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
107
104
{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
108
105
{ USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },