diff options
author | Raimund Roth <raimundmroth@googlemail.com> | 2015-06-08 05:11:38 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-18 04:56:16 -0400 |
commit | 18eec2cd7e9746cd672ada102987534ae16f0f44 (patch) | |
tree | 995ad9e7df9d9dd20a6f47b871fd0eaef39e35a1 | |
parent | 0317a65b94770c953480970f67db0a716778c6a7 (diff) |
HID: microsoft: Add Surface Power Cover
Adding support for the Microsoft Surface Pro Power Cover.
Signed-off-by: Raimund Roth <raimundmroth@gmail.gom>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-core.c | 4 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-microsoft.c | 2 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 2a0bd8e256ac..d596a068b1c6 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -706,7 +706,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) | |||
706 | 706 | ||
707 | if (hid->vendor == USB_VENDOR_ID_MICROSOFT && | 707 | if (hid->vendor == USB_VENDOR_ID_MICROSOFT && |
708 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || | 708 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || |
709 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP) && | 709 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP || |
710 | hid->product == USB_DEVICE_ID_MS_POWER_COVER) && | ||
710 | hid->group == HID_GROUP_MULTITOUCH) | 711 | hid->group == HID_GROUP_MULTITOUCH) |
711 | hid->group = HID_GROUP_GENERIC; | 712 | hid->group = HID_GROUP_GENERIC; |
712 | 713 | ||
@@ -1901,6 +1902,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1901 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, | 1902 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, |
1902 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, | 1903 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, |
1903 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP) }, | 1904 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP) }, |
1905 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, | ||
1904 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, | 1906 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, |
1905 | { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, | 1907 | { HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) }, |
1906 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, | 1908 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 005335e7782e..4c81b07ecba0 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -662,6 +662,7 @@ | |||
662 | #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 | 662 | #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 |
663 | #define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc | 663 | #define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc |
664 | #define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd | 664 | #define USB_DEVICE_ID_MS_TYPE_COVER_3_JP 0x07dd |
665 | #define USB_DEVICE_ID_MS_POWER_COVER 0x07da | ||
665 | 666 | ||
666 | #define USB_VENDOR_ID_MOJO 0x8282 | 667 | #define USB_VENDOR_ID_MOJO 0x8282 |
667 | #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 | 668 | #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index af935eb198c9..32a596f554af 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
@@ -280,6 +280,8 @@ static const struct hid_device_id ms_devices[] = { | |||
280 | .driver_data = MS_HIDINPUT }, | 280 | .driver_data = MS_HIDINPUT }, |
281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP), | 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP), |
282 | .driver_data = MS_HIDINPUT }, | 282 | .driver_data = MS_HIDINPUT }, |
283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), | ||
284 | .driver_data = MS_HIDINPUT }, | ||
283 | 285 | ||
284 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), | 286 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), |
285 | .driver_data = MS_PRESENTER }, | 287 | .driver_data = MS_PRESENTER }, |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 09a22a70bd5e..70dbf61348c8 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -88,6 +88,7 @@ static const struct hid_blacklist { | |||
88 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, | 88 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, |
89 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, | 89 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, |
90 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS }, | 90 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS }, |
91 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, | ||
91 | { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, | 92 | { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, |
92 | { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, | 93 | { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS }, |
93 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, | 94 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, |