Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8104bc authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'wacom' into next 

Merge large update to Wacom driver, converting it from USB to a HID
driver and unifying wired and bluetooth support, from Benjamin
Tissoires.
parents 62238f3a f2e0a7d4

drivers/hid/Kconfig

+9 −4
Original line number Diff line number Diff line
@@ -748,12 +748,17 @@ config THRUSTMASTER_FF 
	  Rumble Force or Force Feedback Wheel.



config HID_WACOM

	tristate "Wacom Bluetooth devices support"

	tristate "Wacom Intuos/Graphire tablet support (USB)"

	depends on HID

	depends on LEDS_CLASS

	select POWER_SUPPLY

	---help---

	Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.

	select NEW_LEDS

	select LEDS_CLASS

	help

	  Say Y here if you want to use the USB or BT version of the Wacom Intuos

	  or Graphire tablet.



	  To compile this driver as a module, choose M here: the

	  module will be called wacom.



config HID_WIIMOTE

	tristate "Nintendo Wii / Wii U peripherals"

drivers/hid/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o 
obj-$(CONFIG_HID_XINMO)		+= hid-xinmo.o

obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o

obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o

obj-$(CONFIG_HID_WACOM)		+= hid-wacom.o



wacom-objs			:= wacom_wac.o wacom_sys.o

obj-$(CONFIG_HID_WACOM)		+= wacom.o

obj-$(CONFIG_HID_WALTOP)	+= hid-waltop.o

obj-$(CONFIG_HID_WIIMOTE)	+= hid-wiimote.o

obj-$(CONFIG_HID_SENSOR_HUB)	+= hid-sensor-hub.o

drivers/hid/hid-core.c

+9 −3
Original line number Diff line number Diff line
@@ -787,6 +787,15 @@ static int hid_scan_report(struct hid_device *hid) 
		/* hid-rmi should take care of them, not hid-generic */

		hid->group = HID_GROUP_RMI;



	/*

	 * Vendor specific handlings

	 */

	switch (hid->vendor) {

	case USB_VENDOR_ID_WACOM:

		hid->group = HID_GROUP_WACOM;

		break;

	}



	vfree(parser);

	return 0;

}
@@ -1933,8 +1942,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_Q_PAD) },
@@ -2339,7 +2346,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WACOM, HID_ANY_ID) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },