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

Commit 2ae3986b authored by Daniel Keller's avatar Daniel Keller Committed by Jiri Kosina
Browse files

HID: microsoft: Add Surface 4 type cover pro 4 not JP versions 



Adding support for not JP versions of the Microsoft Surface 4 Type Cover Pro

[jkosina@suse.cz: The identical patch has been sent by Jeff Farthing, so I am
 including his signoff as well]

Signed-off-by: default avatarJeff Farthing <jeff@jfarthing.com>
Signed-off-by: default avatarDaniel Keller <daniel.keller@gcd.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 15607a3a

drivers/hid/hid-core.c

+4 −0
Original line number Diff line number Diff line
@@ -727,6 +727,8 @@ 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_2 ||

	     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_TYPE_COVER_3 ||

	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
@@ -1983,6 +1985,8 @@ 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_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_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_TYPE_COVER_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -717,6 +717,8 @@ 
#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_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_TYPE_COVER_3    0x07de

#define USB_DEVICE_ID_MS_POWER_COVER     0x07da

drivers/hid/hid-microsoft.c

+4 −0
Original line number Diff line number Diff line
@@ -280,6 +280,10 @@ 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_3_JP),

		.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_TYPE_COVER_PRO_4_JP),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3),

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ 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_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_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_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },