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

Commit 66e5c5ff authored Jan 10, 2017 by Daniel Keller Committed by Jiri Kosina Jan 11, 2017

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



Nearly identical to the patch "multitouch: enable the Surface 4 Type Cover Pro
(JP) to report multitouch data"

We can now remove the support of the Surface 4 Type Cover Pro (not JP versions)
from hid-microsoft so it can properly report multi touch from the touchpad.

Signed-off-by: Daniel Keller <daniel.keller@gcd.de>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 4fed0231

drivers/hid/hid-core.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -727,8 +727,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
	(hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 \|\|		(hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 \|\|
	hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 \|\|		hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 \|\|
	hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP \|\|		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_POWER_COVER) &&		hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
	hid->group == HID_GROUP_MULTITOUCH)		hid->group == HID_GROUP_MULTITOUCH)
	hid->group = HID_GROUP_GENERIC;		hid->group = HID_GROUP_GENERIC;
	@@ -1987,8 +1985,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) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
	{ 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_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_DIGITAL_MEDIA_7K) },		{ 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_600) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },

drivers/hid/hid-ids.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -721,8 +721,6 @@
	#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc		#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
	#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2		#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_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_POWER_COVER 0x07da		#define USB_DEVICE_ID_MS_POWER_COVER 0x07da

	#define USB_VENDOR_ID_MOJO 0x8282		#define USB_VENDOR_ID_MOJO 0x8282

drivers/hid/hid-microsoft.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -280,10 +280,6 @@ static const struct hid_device_id ms_devices[] = {
	.driver_data = MS_HIDINPUT },		.driver_data = MS_HIDINPUT },
	{ 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_3_JP),
	.driver_data = MS_HIDINPUT },		.driver_data = MS_HIDINPUT },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4),
	.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_POWER_COVER),		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),
	.driver_data = MS_HIDINPUT },		.driver_data = MS_HIDINPUT },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),

drivers/hid/usbhid/hid-quirks.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -103,8 +103,6 @@ static const struct hid_blacklist {
	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },		{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },
	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },		{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
	{ 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_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_POWER_COVER, 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_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 },		{ USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },