| From 0ee7767d5be402635a4975b13a5331126912127f Mon Sep 17 00:00:00 2001 |
| From: Yuta Kobayashi <alu.ula@outlook.com> |
| Date: Fri, 12 Aug 2016 07:49:17 +0000 |
| Subject: [PATCH] HID: microsoft: Add Surface 4 type cover pro 4 (JP) |
| |
| commit b490a8537df60d449199e162417da74ee9262515 upstream. |
| |
| Adding support for the Microsoft Surface 4 Type Cover Pro (JP). |
| |
| Signed-off-by: Yuta Kobayashi <alu.ula@outlook.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c |
| index 08f53c7fd513..de7bb35b6a97 100644 |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -727,6 +727,7 @@ 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_JP || |
| hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || |
| hid->product == USB_DEVICE_ID_MS_POWER_COVER) && |
| hid->group == HID_GROUP_MULTITOUCH) |
| @@ -1982,6 +1983,7 @@ 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_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) }, |
| diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h |
| index 7e7205fdcfd4..f434f0b622b6 100644 |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -722,6 +722,7 @@ |
| #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_JP 0x07e9 |
| #define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de |
| #define USB_DEVICE_ID_MS_POWER_COVER 0x07da |
| |
| diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c |
| index e924d555536c..56c586fb8449 100644 |
| --- a/drivers/hid/hid-microsoft.c |
| +++ b/drivers/hid/hid-microsoft.c |
| @@ -288,6 +288,8 @@ 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_JP), |
| + .driver_data = MS_HIDINPUT }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), |
| .driver_data = MS_HIDINPUT }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), |
| diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c |
| index 182d3a2b6c7c..f8923e8ef354 100644 |
| --- a/drivers/hid/usbhid/hid-quirks.c |
| +++ b/drivers/hid/usbhid/hid-quirks.c |
| @@ -103,6 +103,7 @@ 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_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 }, |
| { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, |
| -- |
| 2.12.0 |
| |