Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fed0231 authored by Yuta Kobayashi's avatar Yuta Kobayashi Committed by Jiri Kosina
Browse files

HID: multitouch: enable the Surface 4 Type Cover Pro (JP) to report multitouch data 



Since commit 8fe89ef0 ("HID: multitouch: enable the Surface 3 Type
Cover to report multitouch data"), the TypeCover can be properly handled
by hid-multitouch and don't require any special quirk in the kernel.

Remove the support of the Surface 4 Type Cover Pro (JP) from
hid-microsoft so it can properly report multitouch from the touchpad.

Signed-off-by: default avatarYuta Kobayashi <alu.ula@outlook.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f39fdf2a

drivers/hid/hid-core.c

+0 −2
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 
	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||

	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&

	    hid->group == HID_GROUP_MULTITOUCH)

		hid->group = HID_GROUP_GENERIC;
@@ -1990,7 +1989,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -723,7 +723,6 @@ 
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9

#define USB_DEVICE_ID_MS_POWER_COVER     0x07da



#define USB_VENDOR_ID_MOJO		0x8282

drivers/hid/hid-microsoft.c

+0 −2
Original line number Diff line number Diff line
@@ -284,8 +284,6 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),

drivers/hid/usbhid/hid-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },