Commit 00522de2 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.12/uclogic' into for-linus 

- Trust Panora support improvements from Cristian Klein
parents c35f31fc f7271b2a

drivers/hid/hid-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TRUST, USB_DEVICE_ID_TRUST_PANORA_TABLET), HID_QUIRK_MULTI_INPUT | HID_QUIRK_HIDINPUT_FORCE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_KNA5), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWA60), HID_QUIRK_MULTI_INPUT },

drivers/hid/hid-uclogic-core.c

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,8 @@ static const struct hid_device_id uclogic_devices[] = { 
				USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION,

				USB_DEVICE_ID_HUION_HS64) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TRUST,

				USB_DEVICE_ID_TRUST_PANORA_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,

				USB_DEVICE_ID_HUION_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC,

drivers/hid/hid-uclogic-params.c

+2 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,8 @@ int uclogic_params_init(struct uclogic_params *params, 
			uclogic_params_init_with_pen_unused(&p);

		}

		break;

	case VID_PID(USB_VENDOR_ID_TRUST,

		     USB_DEVICE_ID_TRUST_PANORA_TABLET):

	case VID_PID(USB_VENDOR_ID_UGEE,

		     USB_DEVICE_ID_UGEE_TABLET_G5):

		/* Ignore non-pen interfaces */