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

Commit 4988abf1 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:

 - quite some work on hid-sony driver in order to have DualShock 4
   device properly supported, from Frank Praznik

 - fixed support for suspending I2C conntected devices, from Mika
   Westerberg

 - regression fix for 0xff05 usage on Microsoft Ergonomy, from Jiri
   Kosina

 - support for Synaptics HD touchscreen, from AceLan Kao

 - workaround for USB 3.0 problem for logitech-dj connected devices,
   from Benjamin Tisssoires

 - support for Logitech Dual Action pads, from Vitaly Katraew

 - quite a few other assorted fixes and device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (33 commits)
  HID: sony: Use colors for the Dualshock 4 LED names
  HID: sony: Add annotated HID descriptor for the Dualshock 4
  HID: sony: Cache the output report for the Dualshock 4
  HID: sony: Map gyroscopes and accelerometers to axes
  HID: sony: Fix spacing in the device definitions.
  HID: sony: Use standard output reports instead of raw reports to send data to the Dualshock 4.
  HID: sony: Use separate identifiers for USB and Bluetooth connected Dualshock 4 controllers.
  HID: hid-holtek-mouse: add new a070 mouse
  HID: hid-sensor-hub: Fix buggy report descriptors
  HID: logitech-dj: Fix USB 3.0 issue
  HID: sony: Rename worker function
  HID: sony: Add LED controls for the Dualshock 4
  HID: sony: Add force-feedback support for the Dualshock 4
  HID: hidraw: make comment more accurate and nicer
  HID: sony: fix error return code
  HID: input: fix input sysfs path for hid devices
  HID: debug: add labels for some new buttons
  HID: remove SIS entries from hid_have_special_driver[]
  HID: microsoft: no fallthrough in MS ergonomy 0xff05 usage
  HID: add support for SiS multitouch panel in the touch monitor LG 23ET83V
  ...
parents fe41c2c0 62813858

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ config HID_LOGITECH 


config HID_LOGITECH_DJ

	tristate "Logitech Unifying receivers full support"

	depends on HIDRAW

	depends on HID_LOGITECH

	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

drivers/hid/hid-core.c

+3 −2
Original line number Diff line number Diff line
@@ -1715,6 +1715,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_580) },
@@ -1823,8 +1824,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS9200_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SIS2_TOUCH, USB_DEVICE_ID_SIS817_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
@@ -1832,6 +1831,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

drivers/hid/hid-debug.c

+4 −1
Original line number Diff line number Diff line
@@ -768,6 +768,8 @@ static const char *keys[KEY_MAX + 1] = { 
	[KEY_ALTERASE] = "AlternateErase",	[KEY_CANCEL] = "Cancel",

	[KEY_BRIGHTNESSDOWN] = "BrightnessDown", [KEY_BRIGHTNESSUP] = "BrightnessUp",

	[KEY_MEDIA] = "Media",			[KEY_UNKNOWN] = "Unknown",

	[BTN_DPAD_UP] = "BtnDPadUp",		[BTN_DPAD_DOWN] = "BtnDPadDown",

	[BTN_DPAD_LEFT] = "BtnDPadLeft",	[BTN_DPAD_RIGHT] = "BtnDPadRight",

	[BTN_0] = "Btn0",			[BTN_1] = "Btn1",

	[BTN_2] = "Btn2",			[BTN_3] = "Btn3",

	[BTN_4] = "Btn4",			[BTN_5] = "Btn5",
@@ -797,7 +799,8 @@ static const char *keys[KEY_MAX + 1] = { 
	[BTN_TOOL_MOUSE] = "ToolMouse",		[BTN_TOOL_LENS] = "ToolLens",

	[BTN_TOUCH] = "Touch",			[BTN_STYLUS] = "Stylus",

	[BTN_STYLUS2] = "Stylus2",		[BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",

	[BTN_TOOL_TRIPLETAP] = "ToolTripleTap", [BTN_GEAR_DOWN] = "WheelBtn",

	[BTN_TOOL_TRIPLETAP] = "ToolTripleTap",	[BTN_TOOL_QUADTAP] = "ToolQuadrupleTap",

	[BTN_GEAR_DOWN] = "WheelBtn",

	[BTN_GEAR_UP] = "Gear up",		[KEY_OK] = "Ok",

	[KEY_SELECT] = "Select",		[KEY_GOTO] = "Goto",

	[KEY_CLEAR] = "Clear",			[KEY_POWER2] = "Power2",

drivers/hid/hid-holtek-mouse.c

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
			}

			break;

		case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A:

		case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070:

		case USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081:

			if (*rsize >= 113 && rdesc[106] == 0xff && rdesc[107] == 0x7f

					&& rdesc[111] == 0xff && rdesc[112] == 0x7f) {
@@ -65,6 +66,8 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
static const struct hid_device_id holtek_mouse_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,

			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },

        { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,

			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,

			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,

drivers/hid/hid-ids.h

+12 −3
Original line number Diff line number Diff line
@@ -445,6 +445,10 @@ 
#define USB_VENDOR_ID_ILITEK		0x222a

#define USB_DEVICE_ID_ILITEK_MULTITOUCH	0x0001



#define USB_VENDOR_ID_INTEL_0		0x8086

#define USB_VENDOR_ID_INTEL_1		0x8087

#define USB_DEVICE_ID_INTEL_HID_SENSOR	0x09fa



#define USB_VENDOR_ID_ION		0x15e4

#define USB_DEVICE_ID_ICADE		0x0132
@@ -455,6 +459,7 @@ 
#define USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD	0xa055

#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A04A	0xa04a

#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067	0xa067

#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A070	0xa070

#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A072	0xa072

#define USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A081	0xa081
@@ -552,6 +557,7 @@ 
#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD_CORD	0xc20a

#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD	0xc211

#define USB_DEVICE_ID_LOGITECH_EXTREME_3D	0xc215

#define USB_DEVICE_ID_LOGITECH_DUAL_ACTION	0xc216

#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218

#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219

#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D	0xc283
@@ -755,9 +761,11 @@ 
#define USB_VENDOR_ID_SIGMATEL		0x066F

#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780



#define USB_VENDOR_ID_SIS2_TOUCH	0x0457

#define USB_VENDOR_ID_SIS_TOUCH		0x0457

#define USB_DEVICE_ID_SIS9200_TOUCH	0x9200

#define USB_DEVICE_ID_SIS817_TOUCH	0x0817

#define USB_DEVICE_ID_SIS_TS		0x1013

#define USB_DEVICE_ID_SIS1030_TOUCH	0x1030



#define USB_VENDOR_ID_SKYCABLE			0x1223

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
@@ -767,6 +775,7 @@ 
#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374

#define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306

#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268

#define USB_DEVICE_ID_SONY_PS4_CONTROLLER	0x05c4

#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f

#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002

#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER	0x1000
@@ -809,6 +818,8 @@ 
#define USB_DEVICE_ID_SYNAPTICS_DPAD	0x0013

#define USB_DEVICE_ID_SYNAPTICS_LTS1	0x0af8

#define USB_DEVICE_ID_SYNAPTICS_LTS2	0x1d10

#define USB_DEVICE_ID_SYNAPTICS_HD	0x0ac3

#define USB_DEVICE_ID_SYNAPTICS_QUAD_HD	0x1ac3



#define USB_VENDOR_ID_THINGM		0x27b8

#define USB_DEVICE_ID_BLINK1		0x01ed
@@ -939,7 +950,5 @@ 
#define USB_VENDOR_ID_PRIMAX	0x0461

#define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05



#define USB_VENDOR_ID_SIS	0x0457

#define USB_DEVICE_ID_SIS_TS	0x1013



#endif