From: Jiri Kosina Date: Mon, 9 Feb 2015 10:17:45 +0000 (+0100) Subject: Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for... X-Git-Tag: v5.15~16378^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=988b7fb0bfc215476c3a0a623b442cd0e29ce4c0;p=platform%2Fkernel%2Flinux-starfive.git Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for-3.20/lenovo', 'for-3.20/logitech', 'for-3.20/rmi', 'for-3.20/upstream' and 'for-3.20/wacom' into for-linus --- 988b7fb0bfc215476c3a0a623b442cd0e29ce4c0 diff --cc drivers/hid/hid-core.c index 77afffc,c3d0ac1,9b1442a,c3d0ac1,c3d0ac1,ef718f9,0cea5a0,c3d0ac1..db4fb6e --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@@@@@@@@ -704,9 -704,9 -704,9 -704,9 -704,9 -705,17 -704,10 -704,9 +705,18 @@@@@@@@@ static void hid_scan_collection(struct hid->group = HID_GROUP_SENSOR_HUB; if (hid->vendor == USB_VENDOR_ID_MICROSOFT && ------ - hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 && ++++++ + (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || ++++++ + hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3_JP) && hid->group == HID_GROUP_MULTITOUCH) hid->group = HID_GROUP_GENERIC; +++++ ++ +++++ ++ if ((parser->global.usage_page << 16) == HID_UP_GENDESK) +++++ ++ for (i = 0; i < parser->local.usage_index; i++) +++++ ++ if (parser->local.usage[i] == HID_GD_POINTER) +++++ ++ parser->scan_flags |= HID_SCAN_FLAG_GD_POINTER; +++++ ++ +++++ ++ if ((parser->global.usage_page << 16) >= HID_UP_MSVENDOR) +++++ ++ parser->scan_flags |= HID_SCAN_FLAG_VENDOR_SPECIFIC; } static int hid_scan_main(struct hid_parser *parser, struct hid_item *item) diff --cc drivers/hid/hid-input.c index 9505605,146da43,e0a0f06,e0a0f06,e0a0f06,e0a0f06,a7589003,e0a0f06..052869d --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@@@@@@@@ -306,15 -306,15 -306,12 -306,12 -306,12 -306,12 -306,12 -306,12 +306,18 @@@@@@@@@ static enum power_supply_property hidin static const struct hid_device_id hid_battery_quirks[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, - ------ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), - ------ HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + ++++++ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), + ++++++ HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + ++++++ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, + ++++++ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), + ++++++ HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, ++++++ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, - USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI), + ++++++ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI), ++++++ HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, ------ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI), +++++++ USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO), + HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE }, {}