Commit d487bb6e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.13/upstream-fixes' into for-linus 

- WACOM_HID_WD_TOUCHRINGSTATUS usage mapping fix in Wacom driver
  from Jason Gerecke
- new Logitech device ID quirk from Kyle Roarty
parents c228352d 8d411cbf

drivers/hid/hid-ids.h

+2 −1
Original line number Diff line number Diff line
@@ -666,7 +666,8 @@ 
#define USB_VENDOR_ID_LOGITECH		0x046d

#define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e

#define USB_DEVICE_ID_LOGITECH_T651	0xb00c

#define USB_DEVICE_ID_LOGITECH_C077	0xc007

#define USB_DEVICE_ID_LOGITECH_C007	0xc007

#define USB_DEVICE_ID_LOGITECH_C077	0xc077

#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101

#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C01A, HID_QUIRK_ALWAYS_POLL },

drivers/hid/wacom_wac.c

+7 −1
Original line number Diff line number Diff line
@@ -1846,7 +1846,13 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, 
		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	case WACOM_HID_WD_TOUCHRINGSTATUS:

		wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);

		/*

		 * Only set up type/code association. Completely mapping

		 * this usage may overwrite the axis resolution and range.

		 */

		usage->type = EV_ABS;

		usage->code = ABS_WHEEL;

		set_bit(EV_ABS, input->evbit);

		features->device_type |= WACOM_DEVICETYPE_PAD;

		break;

	case WACOM_HID_WD_BUTTONCONFIG: