HID: multitouch: enable the Surface 4 Type Cover Pro (JP) to report multitouch data

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Since commit 8fe89ef076fa1 ("HID: multitouch: enable the Surface 3 Type
Cover to report multitouch data"), the TypeCover can be properly handled
by hid-multitouch and don't require any special quirk in the kernel.

Remove the support of the Surface 4 Type Cover Pro (JP) from
hid-microsoft so it can properly report multitouch from the touchpad.

Signed-off-by: Yuta Kobayashi <alu.ula@outlook.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Yuta Kobayashi and committed by

Jiri Kosina 9 years ago 4fed0231 f39fdf2a

-6

4 changed files

expand all

drivers

hid

hid-core.c

hid-ids.h

hid-microsoft.c

usbhid

hid-quirks.c

-2

drivers/hid/hid-core.c

··· 729 729 hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || 730 730 hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 || 731 731 hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || 732 - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP || 733 732 hid->product == USB_DEVICE_ID_MS_POWER_COVER) && 734 733 hid->group == HID_GROUP_MULTITOUCH) 735 734 hid->group = HID_GROUP_GENERIC; ··· 1989 1990 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, 1990 1991 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) }, 1991 1992 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, 1992 - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) }, 1993 1993 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, 1994 1994 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, 1995 1995 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },

-1

drivers/hid/hid-ids.h

··· 723 723 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd 724 724 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4 725 725 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 726 - #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9 727 726 #define USB_DEVICE_ID_MS_POWER_COVER 0x07da 728 727 729 728 #define USB_VENDOR_ID_MOJO 0x8282

-2

drivers/hid/hid-microsoft.c

··· 284 284 .driver_data = MS_HIDINPUT }, 285 285 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), 286 286 .driver_data = MS_HIDINPUT }, 287 - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP), 288 - .driver_data = MS_HIDINPUT }, 289 287 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), 290 288 .driver_data = MS_HIDINPUT }, 291 289 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),

-1

drivers/hid/usbhid/hid-quirks.c

··· 105 105 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, 106 106 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS }, 107 107 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS }, 108 - { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS }, 109 108 { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, 110 109 { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, 111 110 { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },