projects / linux-2.6-microblaze.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 689cd9c,2b89c70,2b89c70,2b89c70,39694a5,a5dd7e6,2b89c70,1ed841b,3611ec7,1bbe329,2b89c70..cff060b
--- 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 b531bd4,575aa65,c36ec6d,575aa65,642e648,10d1535,575aa65,dc7e394,e816656,5198a45,6cfb5ca..ec277b9
--- 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 c6cd392,c6cd392,c6cd392,c6cd392,c6cd392,ba02667,c6cd392,c6cd392,c6cd392,5e592f0,c6cd392..74b7b84
--- 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 e6cfd32,e6cfd32,0a0eca5,e6cfd32,05f6f61,18ae715,e6cfd32,0a0eca5,e6cfd32,a67e90a,354d49e..b3e01c8
--- 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
MicroBlaze GIT Repository