From: Jiri Kosina Date: Wed, 14 Dec 2016 09:12:26 +0000 (+0100) Subject: Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=96e132ebc0a162c643e0e6e6f1f85c3be3355715;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for-4.10/intel-ish', 'for-4.10/mayflash', 'for-4.10/microsoft-surface-3', 'for-4.10/multitouch', 'for-4.10/sony', 'for-4.10/udraw-ps3', 'for-4.10/upstream' and 'for-4.10/wacom/generic' into for-linus --- 96e132ebc0a162c643e0e6e6f1f85c3be3355715 diff --cc drivers/hid/hid-core.c index 689cd9cf5025,2b89c701076f,2b89c701076f,2b89c701076f,39694a514726,a5dd7e63ada3,2b89c701076f,1ed841b149e8,3611ec77ddb9,1bbe32966d21,2b89c701076f..cff060b56da9 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@@@@@@@@ -727,8 -727,8 -727,8 -727,8 -727,8 -727,7 -727,8 -727,8 -727,8 -727,10 -727,8 +727,9 @@@@@@@@@@@@ static void hid_scan_collection(struct (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 || +++++++++ + hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 || 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) hid->group = HID_GROUP_GENERIC; @@@@@@@@@@@@ -1984,8 -1983,8 -1983,8 -1983,8 -1986,8 -1982,7 -1983,8 -1983,8 -1983,8 -1985,10 -1983,8 +1988,9 @@@@@@@@@@@@ static const struct hid_device_id hid_h { 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) }, +++++++++ + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) }, { 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) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, diff --cc drivers/hid/hid-ids.h index b531bd408f93,575aa65436d1,c36ec6d01b8b,575aa65436d1,642e64861654,10d15359cbae,575aa65436d1,dc7e39432320,e8166568a900,5198a4525466,6cfb5cacc253..ec277b96eaa1 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@@@@@@@@@@@ -719,8 -718,8 -714,8 -718,8 -719,8 -718,7 -718,8 -714,8 -718,8 -717,10 -717,8 +721,9 @@@@@@@@@@@@ #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 0x07e4 +++++++++ +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8 #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 #define USB_VENDOR_ID_MOJO 0x8282 diff --cc drivers/hid/hid-microsoft.c index c6cd392e9f99,c6cd392e9f99,c6cd392e9f99,c6cd392e9f99,c6cd392e9f99,ba02667beb80,c6cd392e9f99,c6cd392e9f99,c6cd392e9f99,5e592f04095b,c6cd392e9f99..74b7b84a0420 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@@@@@@@@@@@ -280,10 -280,10 -280,10 -280,10 -280,10 -280,8 -280,10 -280,10 -280,10 -280,14 -280,10 +280,12 @@@@@@@@@@@@ static const struct hid_device_id ms_de .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), +++++++++ + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4), +++++++++ + .driver_data = MS_HIDINPUT }, +++++++++ + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2), + .driver_data = MS_HIDINPUT }, ----- --- - { 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_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), .driver_data = MS_HIDINPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD), diff --cc drivers/hid/usbhid/hid-quirks.c index e6cfd323babc,e6cfd323babc,0a0eca5da47d,e6cfd323babc,05f6f61f0213,18ae71503309,e6cfd323babc,0a0eca5da47d,e6cfd323babc,a67e90a8b5be,354d49ea36dd..b3e01c82af05 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@@@@@@@@@@@ -101,8 -101,8 -99,8 -101,8 -102,8 -101,7 -101,8 -99,8 -101,8 -100,10 -100,8 +103,9 @@@@@@@@@@@@ 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, HID_QUIRK_NO_INIT_REPORTS }, +++++++++ + { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, 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 }, { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },