From: Jiri Kosina Date: Mon, 22 Jun 2015 14:22:06 +0000 (+0200) Subject: Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=817a3125819983956bb8a22455a569aac4e8ea34;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus Conflicts: drivers/hid/hid-logitech-hidpp.c --- 817a3125819983956bb8a22455a569aac4e8ea34 diff --cc drivers/hid/hid-logitech-hidpp.c index 5fd530acf747,b3cf6fd4be96,394a6f41af09..484196459305 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@@@ -40,10 -40,11 -40,12 +40,11 @@@@ MODULE_PARM_DESC(disable_raw_mode #define HIDPP_REPORT_LONG_LENGTH 20 #define HIDPP_QUIRK_CLASS_WTP BIT(0) ++ #define HIDPP_QUIRK_CLASS_M560 BIT(1) -- /* bits 1..20 are reserved for classes */ ++ /* bits 2..20 are reserved for classes */ #define HIDPP_QUIRK_DELAYED_INIT BIT(21) #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS BIT(22) --#define HIDPP_QUIRK_MULTI_INPUT BIT(23) /* * There are two hidpp protocols in use, the first version hidpp10 is known @@@@ -1281,6 -1296,11 -1513,15 +1498,10 @@@@ static const struct hid_device_id hidpp HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_T651), .driver_data = HIDPP_QUIRK_CLASS_WTP }, -- { /* Keyboard TK820 */ - HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, - USB_VENDOR_ID_LOGITECH, 0x4102), - .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT | - HIDPP_QUIRK_CLASS_WTP }, ++ { /* Mouse logitech M560 */ + HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, - USB_VENDOR_ID_LOGITECH, 0x4102), - .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT | - HIDPP_QUIRK_CLASS_WTP }, ++ USB_VENDOR_ID_LOGITECH, 0x402d), ++ .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_CLASS_M560 }, { HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},