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

Commit 27a67e0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull HID updates from Jiri Kosina:

 - a lot of Wacom driver updates; most notably second generation Intuos
   Pro is now supported, code from Aaron Armstrong Skomra and Jason
   Gerecke

 - Surface 3 and 4 Type Cover Pro support from Daniel Keller, Dennis
   Chen and Yuta Kobayashi

 - hid-rmi is now generic transport driver, used by synaptics-rmi4;
   Support the Lenovo Thinkpad X1 Tablet dock follows on top, from
   Andrew Duggan

 - a few misc bugfixes and improvements here and there

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
  HID: intel-ish-hid: constify device_type structure
  HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range
  HID: intel-ish-hid: ipc: check FW status to distinguish ISH resume paths
  HID: multitouch: fix LG Melfas touchscreen
  HID: wacom: don't apply generic settings to old devices
  HID: wacom: generic: support LEDs
  HID: wacom: generic: support generic touch switch
  HID: wacom: generic: add vendor defined touch
  HID: wacom: generic: add support for touchring
  HID: wacom: generic: remove input_event_flag
  HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface
  HID: wacom: Move WAC_CMD_* into wacom_wac.h
  HID: wacom: Enable HID_GENERIC codepath for Bluetooth devices
  HID: wacom: do not attempt to switch mode while in probe
  HID: wacom: remove warning while disconnecting devices
  HID: wacom: release the resources before leaving despite devm
  HID: whitespace cleanup
  HID: multitouch: enable Surface 3 Type Cover Pro to report multitouch data
  HID: rmi: Support the Lenovo Thinkpad X1 Tablet dock using hid-rmi
  HID: rmi: Handle all Synaptics touchpads using hid-rmi
  ...
parents 59da2a06 53f724b2

drivers/hid/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -785,6 +785,11 @@ config HID_SUNPLUS 
config HID_RMI

	tristate "Synaptics RMI4 device support"

	depends on HID

	select RMI4_CORE

	select RMI4_F03

	select RMI4_F11

	select RMI4_F12

	select RMI4_F30

	---help---

	Support for Synaptics RMI4 touchpads.

	Say Y here if you have a Synaptics RMI4 touchpads over i2c-hid or usbhid

drivers/hid/hid-core.c

+10 −17
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
 */



#define DRIVER_DESC "HID core driver"

#define DRIVER_LICENSE "GPL"



int hid_debug = 0;

module_param_named(debug, hid_debug, int, 0600);
@@ -724,13 +723,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 
		hid->group = HID_GROUP_SENSOR_HUB;



	if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&

	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||

	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&

	    hid->product == USB_DEVICE_ID_MS_POWER_COVER &&

	    hid->group == HID_GROUP_MULTITOUCH)

		hid->group = HID_GROUP_GENERIC;
@@ -826,7 +819,8 @@ static int hid_scan_report(struct hid_device *hid) 
		hid->group = HID_GROUP_WACOM;

		break;

	case USB_VENDOR_ID_SYNAPTICS:

		if (hid->group == HID_GROUP_GENERIC)

		if (hid->group == HID_GROUP_GENERIC ||

		    hid->group == HID_GROUP_MULTITOUCH_WIN_8)

			if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)

			    && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))

				/*
@@ -1887,6 +1881,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },

#if IS_ENABLED(CONFIG_HID_MAYFLASH)

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },
@@ -1933,6 +1930,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MELFAS_MT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
@@ -1985,12 +1983,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
@@ -2126,6 +2118,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },

	{ }

};
@@ -2867,5 +2860,5 @@ module_exit(hid_exit); 
MODULE_AUTHOR("Andreas Gal");

MODULE_AUTHOR("Vojtech Pavlik");

MODULE_AUTHOR("Jiri Kosina");

MODULE_LICENSE(DRIVER_LICENSE);

MODULE_LICENSE("GPL");

drivers/hid/hid-ids.h

+4 −7
Original line number Diff line number Diff line
@@ -323,7 +323,8 @@ 
#define USB_DEVICE_ID_DRAGONRISE_WIIU		0x1800

#define USB_DEVICE_ID_DRAGONRISE_PS3		0x1801

#define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR	0x1803

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE	0x1843

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE1	0x1843

#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE2	0x1844



#define USB_VENDOR_ID_DWAV		0x0eef

#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER	0x0001
@@ -630,9 +631,11 @@ 
#define USB_DEVICE_ID_LENOVO_CUSBKBD	0x6047

#define USB_DEVICE_ID_LENOVO_CBTKBD	0x6048

#define USB_DEVICE_ID_LENOVO_TPPRODOCK	0x6067

#define USB_DEVICE_ID_LENOVO_X1_COVER	0x6085



#define USB_VENDOR_ID_LG		0x1fd2

#define USB_DEVICE_ID_LG_MULTITOUCH	0x0064

#define USB_DEVICE_ID_LG_MELFAS_MT	0x6007



#define USB_VENDOR_ID_LOGITECH		0x046d

#define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
@@ -725,12 +728,6 @@ 
#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799

#define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7

#define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3    0x07dc

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2  0x07e2

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8

#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9

#define USB_DEVICE_ID_MS_POWER_COVER     0x07da



#define USB_VENDOR_ID_MOJO		0x8282

drivers/hid/hid-mf.c

+14 −5
Original line number Diff line number Diff line
@@ -6,12 +6,14 @@ 
 *

 * Tested with:

 * 0079:1801 "DragonRise Inc. Mayflash PS3 Game Controller Adapter"

 * 0079:1803 "DragonRise Inc. Mayflash Wireless Sensor DolphinBar"

 * 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"

 * 0079:1844 "DragonRise Inc. Mayflash GameCube Game Controller Adapter (v04)"

 *

 * The following adapters probably work too, but need to be tested:

 * 0079:1800 "DragonRise Inc. Mayflash WIIU Game Controller Adapter"

 * 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"

 *

 * Copyright (c) 2016 Marcel Hasler <mahasler@gmail.com>

 * Copyright (c) 2016-2017 Marcel Hasler <mahasler@gmail.com>

 */



/*
@@ -125,8 +127,8 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id) 


	dev_dbg(&hid->dev, "Mayflash HID hardware probe...\n");



	/* Split device into four inputs */

	hid->quirks |= HID_QUIRK_MULTI_INPUT;

	/* Apply quirks as needed */

	hid->quirks |= id->driver_data;



	error = hid_parse(hid);

	if (error) {
@@ -151,7 +153,14 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id) 
}



static const struct hid_device_id mf_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3),  },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3),

		.driver_data = HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR),

		.driver_data = HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1),

		.driver_data = HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2),

		.driver_data = 0 }, /* No quirk required */

	{ }

};

MODULE_DEVICE_TABLE(hid, mf_devices);

drivers/hid/hid-microsoft.c

+0 −12
Original line number Diff line number Diff line
@@ -274,18 +274,6 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),

		.driver_data = MS_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),

		.driver_data = MS_HIDINPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),