diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index bdb8cc89cacc..4f9c5c6deaed 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1979,6 +1979,9 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1979 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, | 1979 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, |
| 1980 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, | 1980 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, |
| 1981 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, | 1981 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, |
| 1982 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, | ||
| 1983 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, | ||
| 1984 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, | ||
| 1982 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, | 1985 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, |
| 1983 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, | 1986 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, |
| 1984 | { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, | 1987 | { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5c0e43ed5c53..c6eaff5f8845 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -676,6 +676,7 @@ | |||
| 676 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b | 676 | #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b |
| 677 | #define USB_DEVICE_ID_MS_OFFICE_KB 0x0048 | 677 | #define USB_DEVICE_ID_MS_OFFICE_KB 0x0048 |
| 678 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d | 678 | #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d |
| 679 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K 0x00b4 | ||
| 679 | #define USB_DEVICE_ID_MS_NE4K 0x00db | 680 | #define USB_DEVICE_ID_MS_NE4K 0x00db |
| 680 | #define USB_DEVICE_ID_MS_NE4K_JP 0x00dc | 681 | #define USB_DEVICE_ID_MS_NE4K_JP 0x00dc |
| 681 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 | 682 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 |
| @@ -683,6 +684,8 @@ | |||
| 683 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 | 684 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 |
| 684 | #define USB_DEVICE_ID_MS_NE7K 0x071d | 685 | #define USB_DEVICE_ID_MS_NE7K 0x071d |
| 685 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 | 686 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 |
| 687 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732 | ||
| 688 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600 0x0750 | ||
| 686 | #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c | 689 | #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c |
| 687 | #define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3 | 690 | #define USB_DEVICE_ID_MS_COMFORT_KEYBOARD 0x00e3 |
| 688 | #define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799 | 691 | #define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799 |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 75cd3bc59c54..e924d555536c 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
| @@ -272,6 +272,12 @@ static const struct hid_device_id ms_devices[] = { | |||
| 272 | .driver_data = MS_PRESENTER }, | 272 | .driver_data = MS_PRESENTER }, |
| 273 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K), | 273 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K), |
| 274 | .driver_data = MS_ERGONOMY | MS_RDESC_3K }, | 274 | .driver_data = MS_ERGONOMY | MS_RDESC_3K }, |
| 275 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K), | ||
| 276 | .driver_data = MS_ERGONOMY }, | ||
| 277 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600), | ||
| 278 | .driver_data = MS_ERGONOMY }, | ||
| 279 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1), | ||
| 280 | .driver_data = MS_ERGONOMY }, | ||
| 275 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), | 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), |
| 276 | .driver_data = MS_NOGET }, | 282 | .driver_data = MS_NOGET }, |
| 277 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), | 283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), |
