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

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

- XP-PEN Deco L support (José Expósito)
parents db244339 0cb1fc09

drivers/hid/.kunitconfig

0 → 100644
+5 −0
Original line number Diff line number Diff line 
CONFIG_KUNIT=y

CONFIG_USB=y

CONFIG_USB_HID=y

CONFIG_HID_UCLOGIC=y

CONFIG_HID_KUNIT_TEST=y

drivers/hid/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -1306,6 +1306,22 @@ config HID_MCP2221 
	To compile this driver as a module, choose M here: the module

	will be called hid-mcp2221.ko.



config HID_KUNIT_TEST

	bool "KUnit tests for HID" if !KUNIT_ALL_TESTS

	depends on KUNIT=y

	depends on HID_UCLOGIC

	default KUNIT_ALL_TESTS

	help

	  This builds unit tests for HID. This option is not useful for

	  distributions or general kernels, but only for kernel

	  developers working on HID and associated drivers.



	  For more information on KUnit and unit tests in general,

	  please refer to the KUnit documentation in

	  Documentation/dev-tools/kunit/.



	  If in doubt, say "N".



endmenu



endif # HID

drivers/hid/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o 
obj-$(CONFIG_HID_SENSOR_HUB)	+= hid-sensor-hub.o

obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR)	+= hid-sensor-custom.o



obj-$(CONFIG_HID_KUNIT_TEST)	+= hid-uclogic-rdesc.o \

				   hid-uclogic-rdesc-test.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

obj-$(CONFIG_USB_KBD)		+= usbhid/

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ 
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540	0x0075

#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640	0x0094

#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01	0x0042

#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L	0x0935

#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06	0x0078

#define USB_DEVICE_ID_UGEE_TABLET_G5		0x0074

#define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071

drivers/hid/hid-uclogic-core.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06) },

	{ }