projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ce12d8 13c28b0 8cd1616 608ad18 f869045 b897f6d 594312b de66a1a 9c5dcd7 c60fa55 c9cfb2a)
Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for...
authorJiri Kosina <jkosina@suse.cz>
Wed, 14 Dec 2016 09:12:26 +0000 (10:12 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 14 Dec 2016 09:12:26 +0000 (10:12 +0100)
1  2  3  4  5  6  7  8  9  10  11 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/Makefile patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/hid-core.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/hid-input.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/hid-microsoft.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/hid-multitouch.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/intel-ish-hid/ipc/ipc.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
drivers/hid/usbhid/hid-quirks.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history
include/linux/hid.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | diff10 | diff11 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-core.c
index 689cd9cf502543c8c0162c8b9bdd08c9fcff86b4,2b89c701076f3eadc9c572015c3d20cfcfab6bd1,2b89c701076f3eadc9c572015c3d20cfcfab6bd1,2b89c701076f3eadc9c572015c3d20cfcfab6bd1,39694a5147267b09a78db5b2a5142503a83d22f2,a5dd7e63ada3a7f81f8ffd29c67c656dc49b6a50,2b89c701076f3eadc9c572015c3d20cfcfab6bd1,1ed841b149e8d9e47fe1d99cf129c73a7162436e,3611ec77ddb9fcab4da159ec215b938c2d68ea24,1bbe32966d21a4318f18ee2bf9713e39c4a53232,2b89c701076f3eadc9c572015c3d20cfcfab6bd1..cff060b56da9d6cb8cb138657cf4efca7debef61
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
--- 6/drivers/hid/hid-core.c
--- 7/drivers/hid/hid-core.c
--- 8/drivers/hid/hid-core.c
--- 9/drivers/hid/hid-core.c
--- 10/drivers/hid/hid-core.c
--- 11/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 b531bd408f938859eae9f45568cecf965cc7b12c,575aa65436d182c31fb874a432807688747dd785,c36ec6d01b8b980fd59a8729598cc78abf7ed576,575aa65436d182c31fb874a432807688747dd785,642e648616542ea7bd75f9b00a2d8e8a1a87306e,10d15359cbaed19c5aaa4ddb78e92fb289153f08,575aa65436d182c31fb874a432807688747dd785,dc7e39432320542987decf08b3075f4645d4e512,e8166568a900c2408f4c91acc27a5bed35aedaa6,5198a45254663e90bbe011b99e07e0a07a012096,6cfb5cacc2533b3f5a21c488ff7257c44d3b43df..ec277b96eaa1b33461aa7702f38864598b910e59
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
--- 3/drivers/hid/hid-ids.h
--- 4/drivers/hid/hid-ids.h
--- 5/drivers/hid/hid-ids.h
--- 6/drivers/hid/hid-ids.h
--- 7/drivers/hid/hid-ids.h
--- 8/drivers/hid/hid-ids.h
--- 9/drivers/hid/hid-ids.h
--- 10/drivers/hid/hid-ids.h
--- 11/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-input.c
Simple merge
diff --cc drivers/hid/hid-microsoft.c
index c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,ba02667beb804420f9e2a0d66ca1f34498c61a03,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525,5e592f04095b3fd3a694067d1c21d7cc4032ed3f,c6cd392e9f99c6cba2c5948bc2c42f2cf066e525..74b7b84a0420b7e40ec0f11868d1d3ee187ebe6a
--- 1/drivers/hid/hid-microsoft.c
--- 2/drivers/hid/hid-microsoft.c
--- 3/drivers/hid/hid-microsoft.c
--- 4/drivers/hid/hid-microsoft.c
--- 5/drivers/hid/hid-microsoft.c
--- 6/drivers/hid/hid-microsoft.c
--- 7/drivers/hid/hid-microsoft.c
--- 8/drivers/hid/hid-microsoft.c
--- 9/drivers/hid/hid-microsoft.c
--- 10/drivers/hid/hid-microsoft.c
--- 11/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/hid-multitouch.c
Simple merge
diff --cc drivers/hid/intel-ish-hid/ipc/ipc.c
Simple merge
diff --cc drivers/hid/usbhid/hid-quirks.c
index e6cfd323babc62d653146730e4d7325ee8a24696,e6cfd323babc62d653146730e4d7325ee8a24696,0a0eca5da47d0274cca10822e3b8d6aded20b6c7,e6cfd323babc62d653146730e4d7325ee8a24696,05f6f61f0213384a73bfd67f0fc627aad31fd597,18ae715033091fac359a65bb343b7c1758cd179c,e6cfd323babc62d653146730e4d7325ee8a24696,0a0eca5da47d0274cca10822e3b8d6aded20b6c7,e6cfd323babc62d653146730e4d7325ee8a24696,a67e90a8b5be0af8802da7e46fb1aa0acd215120,354d49ea36dd9d434452cff07e2b0fb15356035e..b3e01c82af0512dce7a68e6bde908d7e3afeaba8
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
--- 3/drivers/hid/usbhid/hid-quirks.c
--- 4/drivers/hid/usbhid/hid-quirks.c
--- 5/drivers/hid/usbhid/hid-quirks.c
--- 6/drivers/hid/usbhid/hid-quirks.c
--- 7/drivers/hid/usbhid/hid-quirks.c
--- 8/drivers/hid/usbhid/hid-quirks.c
--- 9/drivers/hid/usbhid/hid-quirks.c
--- 10/drivers/hid/usbhid/hid-quirks.c
--- 11/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 },
diff --cc include/linux/hid.h
Simple merge
John Crispins staging tree