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) },

drivers/hid/hid-wacom.c

deleted100644 → 0
+0 −973

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/input/tablet/wacom.h→drivers/hid/wacom.h

+17 −10
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *  Copyright (c) 2001 Frederic Lepied		<flepied@mandrakesoft.com>

 *  Copyright (c) 2004 Panagiotis Issaris	<panagiotis.issaris@mech.kuleuven.ac.be>

 *  Copyright (c) 2002-2011 Ping Cheng		<pingc@wacom.com>

 *  Copyright (c) 2014 Benjamin Tissoires	<benjamin.tissoires@redhat.com>

 *

 *  ChangeLog:

 *      v0.1 (vp)  - Initial release
@@ -72,6 +73,8 @@ 
 *      v1.52 (pc) - Query Wacom data upon system resume

 *                 - add defines for features->type

 *                 - add new devices (0x9F, 0xE2, and 0XE3)

 *      v2.00 (bt) - conversion to a HID driver

 *                 - integration of the Bluetooth devices

 */



/*
@@ -93,35 +96,30 @@ 
/*

 * Version Information

 */

#define DRIVER_VERSION "v1.53"

#define DRIVER_VERSION "v2.00"

#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"

#define DRIVER_DESC "USB Wacom tablet driver"

#define DRIVER_LICENSE "GPL"



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE(DRIVER_LICENSE);



#define USB_VENDOR_ID_WACOM	0x056a

#define USB_VENDOR_ID_LENOVO	0x17ef



struct wacom {

	dma_addr_t data_dma;

	struct usb_device *usbdev;

	struct usb_interface *intf;

	struct urb *irq;

	struct wacom_wac wacom_wac;

	struct hid_device *hdev;

	struct mutex lock;

	struct work_struct work;

	bool open;

	char phys[32];

	struct wacom_led {

		u8 select[2]; /* status led selector (0..3) */

		u8 llv;       /* status led brightness no button (1..127) */

		u8 hlv;       /* status led brightness button pressed (1..127) */

		u8 img_lum;   /* OLED matrix display brightness */

	} led;

	bool led_initialized;

	struct power_supply battery;

	struct power_supply ac;

};



static inline void wacom_schedule_work(struct wacom_wac *wacom_wac)
@@ -130,10 +128,19 @@ static inline void wacom_schedule_work(struct wacom_wac *wacom_wac) 
	schedule_work(&wacom->work);

}



extern const struct usb_device_id wacom_ids[];

static inline void wacom_notify_battery(struct wacom_wac *wacom_wac)

{

	struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac);



	power_supply_changed(&wacom->battery);

}



extern const struct hid_device_id wacom_ids[];



void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len);

void wacom_setup_device_quirks(struct wacom_features *features);

int wacom_setup_input_capabilities(struct input_dev *input_dev,

				   struct wacom_wac *wacom_wac);

int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,

				       struct wacom_wac *wacom_wac);

#endif