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

Commit c847a89a authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Jiri Kosina
Browse files

HID: microsoft: add support for 3 more devices 

Adds support for the Micrsift Digital 4K, Media 600 and Media 3000 V1 Keyboards,
which have the same quirks as the already existing hardware MS_NE4K.

Fixes https://bugzilla.kernel.org/show_bug.cgi?id=52841



[jkosina@suse.cz: rephrase changelog]
Signed-off-by: default avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0a0f5b7e

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1979,6 +1979,9 @@ 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_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_3) },

	{ 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) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ 
#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b

#define USB_DEVICE_ID_MS_OFFICE_KB	0x0048

#define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K 0x00b4

#define USB_DEVICE_ID_MS_NE4K		0x00db

#define USB_DEVICE_ID_MS_NE4K_JP	0x00dc

#define USB_DEVICE_ID_MS_LK6K		0x00f9
@@ -683,6 +684,8 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#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

drivers/hid/hid-microsoft.c

+6 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_PRESENTER },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K),

		.driver_data = MS_ERGONOMY | MS_RDESC_3K },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0),

		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),