Commit fea91239 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - Synaptics touchpad on multiple laptops (Dynabook Portege X30L-G,
   Dynabook Portege X30-D, TUXEDO InfinityBook Pro 14 v5, Dell Precision
   M3800, HP Elitebook 850 G1) switched from PS/2 to SMBus mode

 - a number of new controllers added to xpad driver: HORI Drum
   controller, PowerA Fusion Pro 4, PowerA MOGA XP-Ultra controller,
   8BitDo Ultimate 2 Wireless Controller, 8BitDo Ultimate 3-mode
   Controller, Hyperkin DuchesS Xbox One controller

 - fixes to xpad driver to properly handle Mad Catz JOYTECH NEO SE
   Advanced and PDP Mirror's Edge Official controllers

 - fixes to xpad driver to properly handle "Share" button on some
   controllers

 - a fix for device initialization timing and for waking up the
   controller in cyttsp5 driver

 - a fix for hisi_powerkey driver to properly wake up from s2idle state

 - other assorted cleanups and fixes

* tag 'input-for-v6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - fix xpad_device sorting
  Input: xpad - add support for several more controllers
  Input: xpad - fix Share button on Xbox One controllers
  Input: xpad - fix two controller table values
  Input: hisi_powerkey - enable system-wakeup for s2idle
  Input: synaptics - enable InterTouch on Dell Precision M3800
  Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5
  Input: synaptics - enable InterTouch on Dynabook Portege X30L-G
  Input: synaptics - enable InterTouch on Dynabook Portege X30-D
  Input: synaptics - enable SMBus for HP Elitebook 850 G1
  Input: mtk-pmic-keys - fix possible null pointer dereference
  Input: xpad - add support for 8BitDo Ultimate 2 Wireless Controller
  Input: cyttsp5 - fix power control issue on wakeup
  MAINTAINERS: .mailmap: update Mattijs Korpershoek's email address
  dt-bindings: mediatek,mt6779-keypad: Update Mattijs' email address
  Input: stmpe-ts - use module alias instead of device table
  Input: cyttsp5 - ensure minimum reset pulse width
  Input: sparcspkr - avoid unannotated fall-through
  input/joystick: magellan: Mark __nonstring look-up table
parents f717acc6 93406e9d

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu> 
Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>

Matthieu CASTET <castet.matthieu@free.fr>

Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>

Mattijs Korpershoek <mkorpershoek@kernel.org> <mkorpershoek@baylibre.com>

Matt Ranostay <matt@ranostay.sg> <matt.ranostay@konsulko.com>

Matt Ranostay <matt@ranostay.sg> <matt@ranostay.consulting>

Matt Ranostay <matt@ranostay.sg> Matthew Ranostay <mranostay@embeddedalley.com>

Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Mediatek's Keypad Controller



maintainers:

  - Mattijs Korpershoek <mkorpershoek@baylibre.com>

  - Mattijs Korpershoek <mkorpershoek@kernel.org>



allOf:

  - $ref: /schemas/input/matrix-keymap.yaml#

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -15072,7 +15072,7 @@ F: Documentation/devicetree/bindings/media/mediatek-jpeg-*.yaml 
F:	drivers/media/platform/mediatek/jpeg/









MEDIATEK KEYPAD DRIVER









M:	Mattijs Korpershoek <mkorpershoek@baylibre.com>









M:	Mattijs Korpershoek <mkorpershoek@kernel.org>









S:	Supported









F:	Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml









F:	drivers/input/keyboard/mt6779-keypad.c
































drivers/input/joystick/magellan.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -48,7 +48,7 @@ struct magellan {

















static int magellan_crunch_nibbles(unsigned char *data, int count)









{









	static unsigned char nibbles[16] __nonstring = "0AB3D56GH9:K<MN?";









	static const unsigned char nibbles[16] __nonstring = "0AB3D56GH9:K<MN?";



















	do {









		if (data[count] == nibbles[data[count] & 0xf])
































drivers/input/joystick/xpad.c



+31
−18






























Original line number
Diff line number
Diff line







@@ -77,12 +77,13 @@







 * xbox d-pads should map to buttons, as is required for DDR pads









 * but we map them to axes when possible to simplify things









 */









#define MAP_DPAD_TO_BUTTONS		(1 << 0)









#define MAP_TRIGGERS_TO_BUTTONS		(1 << 1)









#define MAP_STICKS_TO_NULL		(1 << 2)









#define MAP_SELECT_BUTTON		(1 << 3)









#define MAP_PADDLES			(1 << 4)









#define MAP_PROFILE_BUTTON		(1 << 5)









#define MAP_DPAD_TO_BUTTONS		BIT(0)









#define MAP_TRIGGERS_TO_BUTTONS		BIT(1)









#define MAP_STICKS_TO_NULL		BIT(2)









#define MAP_SHARE_BUTTON		BIT(3)









#define MAP_PADDLES			BIT(4)









#define MAP_PROFILE_BUTTON		BIT(5)









#define MAP_SHARE_OFFSET		BIT(6)



















#define DANCEPAD_MAP_CONFIG	(MAP_DPAD_TO_BUTTONS |			\









				MAP_TRIGGERS_TO_BUTTONS | MAP_STICKS_TO_NULL)








@@ -135,14 +136,14 @@ static const struct xpad_device {







	{ 0x03f0, 0x048D, "HyperX Clutch", 0, XTYPE_XBOX360 },			/* wireless */









	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },









	{ 0x03f0, 0x07A0, "HyperX Clutch Gladiate RGB", 0, XTYPE_XBOXONE },









	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },		/* v2 */









	{ 0x03f0, 0x08B6, "HyperX Clutch Gladiate", MAP_SHARE_BUTTON, XTYPE_XBOXONE },		/* v2 */









	{ 0x03f0, 0x09B4, "HyperX Clutch Tanto", 0, XTYPE_XBOXONE },









	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },









	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },









	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },









	{ 0x044f, 0xd01e, "ThrustMaster, Inc. ESWAP X 2 ELDEN RING EDITION", 0, XTYPE_XBOXONE },









	{ 0x044f, 0x0f10, "Thrustmaster Modena GT Wheel", 0, XTYPE_XBOX },









	{ 0x044f, 0xb326, "Thrustmaster Gamepad GP XID", 0, XTYPE_XBOX360 },









	{ 0x044f, 0xd01e, "ThrustMaster, Inc. ESWAP X 2 ELDEN RING EDITION", 0, XTYPE_XBOXONE },









	{ 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)", 0, XTYPE_XBOX },









	{ 0x045e, 0x0285, "Microsoft X-Box pad (Japan)", 0, XTYPE_XBOX },









	{ 0x045e, 0x0287, "Microsoft Xbox Controller S", 0, XTYPE_XBOX },








@@ -159,7 +160,7 @@ static const struct xpad_device {







	{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W },









	{ 0x045e, 0x0b00, "Microsoft X-Box One Elite 2 pad", MAP_PADDLES, XTYPE_XBOXONE },









	{ 0x045e, 0x0b0a, "Microsoft X-Box Adaptive Controller", MAP_PROFILE_BUTTON, XTYPE_XBOXONE },









	{ 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },









	{ 0x045e, 0x0b12, "Microsoft Xbox Series S|X Controller", MAP_SHARE_BUTTON | MAP_SHARE_OFFSET, XTYPE_XBOXONE },









	{ 0x046d, 0xc21d, "Logitech Gamepad F310", 0, XTYPE_XBOX360 },









	{ 0x046d, 0xc21e, "Logitech Gamepad F510", 0, XTYPE_XBOX360 },









	{ 0x046d, 0xc21f, "Logitech Gamepad F710", 0, XTYPE_XBOX360 },








@@ -205,13 +206,13 @@ static const struct xpad_device {







	{ 0x0738, 0x9871, "Mad Catz Portable Drum", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xb738, "Mad Catz MVC2TE Stick 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },









	{ 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },









	{ 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xcb02, "Saitek Cyborg Rumble Pad - PC/Xbox 360", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xcb03, "Saitek P3200 Rumble Pad - PC/Xbox 360", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xcb29, "Saitek Aviator Stick AV8R02", 0, XTYPE_XBOX360 },









	{ 0x0738, 0xf738, "Super SFIV FightStick TE S", 0, XTYPE_XBOX360 },









	{ 0x07ff, 0xffff, "Mad Catz GamePad", 0, XTYPE_XBOX360 },









	{ 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", 0, XTYPE_XBOXONE },









	{ 0x0b05, 0x1a38, "ASUS ROG RAIKIRI", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x0b05, 0x1abb, "ASUS ROG RAIKIRI PRO", 0, XTYPE_XBOXONE },









	{ 0x0c12, 0x0005, "Intec wireless", 0, XTYPE_XBOX },









	{ 0x0c12, 0x8801, "Nyko Xbox Controller", 0, XTYPE_XBOX },








@@ -240,7 +241,7 @@ static const struct xpad_device {







	{ 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One", 0, XTYPE_XBOXONE },









	{ 0x0e6f, 0x0147, "PDP Marvel Xbox One Controller", 0, XTYPE_XBOXONE },









	{ 0x0e6f, 0x015c, "PDP Xbox One Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },









	{ 0x0e6f, 0x015d, "PDP Mirror's Edge Official Wired Controller for Xbox One", XTYPE_XBOXONE },









	{ 0x0e6f, 0x015d, "PDP Mirror's Edge Official Wired Controller for Xbox One", 0, XTYPE_XBOXONE },









	{ 0x0e6f, 0x0161, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },









	{ 0x0e6f, 0x0162, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },









	{ 0x0e6f, 0x0163, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },








@@ -281,6 +282,7 @@ static const struct xpad_device {







	{ 0x0f0d, 0x00dc, "HORIPAD FPS for Nintendo Switch", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },









	{ 0x0f0d, 0x0151, "Hori Racing Wheel Overdrive for Xbox Series X", 0, XTYPE_XBOXONE },









	{ 0x0f0d, 0x0152, "Hori Racing Wheel Overdrive for Xbox Series X", 0, XTYPE_XBOXONE },









	{ 0x0f0d, 0x01b2, "HORI Taiko No Tatsujin Drum Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x0f30, 0x010b, "Philips Recoil", 0, XTYPE_XBOX },









	{ 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },









	{ 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },








@@ -353,6 +355,8 @@ static const struct xpad_device {







	{ 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE },









	{ 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, XTYPE_XBOXONE },









	{ 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 },









	{ 0x20d6, 0x400b, "PowerA FUSION Pro 4 Wired Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x20d6, 0x890b, "PowerA MOGA XP-Ultra Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x2345, 0xe00b, "Machenike G5 Pro Controller", 0, XTYPE_XBOX360 },









	{ 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },









	{ 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },








@@ -384,13 +388,16 @@ static const struct xpad_device {







	{ 0x294b, 0x3404, "Snakebyte GAMEPAD RGB X", 0, XTYPE_XBOXONE },









	{ 0x2993, 0x2001, "TECNO Pocket Go", 0, XTYPE_XBOX360 },









	{ 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE },









	{ 0x2dc8, 0x200f, "8BitDo Ultimate 3-mode Controller for Xbox", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x2dc8, 0x3106, "8BitDo Ultimate Wireless / Pro 2 Wired Controller", 0, XTYPE_XBOX360 },









	{ 0x2dc8, 0x3109, "8BitDo Ultimate Wireless Bluetooth", 0, XTYPE_XBOX360 },









	{ 0x2dc8, 0x310a, "8BitDo Ultimate 2C Wireless Controller", 0, XTYPE_XBOX360 },









	{ 0x2dc8, 0x310b, "8BitDo Ultimate 2 Wireless Controller", 0, XTYPE_XBOX360 },









	{ 0x2dc8, 0x6001, "8BitDo SN30 Pro", 0, XTYPE_XBOX360 },









	{ 0x2e24, 0x0423, "Hyperkin DuchesS Xbox One pad", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },









	{ 0x2e24, 0x1688, "Hyperkin X91 X-Box One pad", 0, XTYPE_XBOXONE },









	{ 0x2e95, 0x0504, "SCUF Gaming Controller", MAP_SELECT_BUTTON, XTYPE_XBOXONE },









	{ 0x2e95, 0x0504, "SCUF Gaming Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE },









	{ 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 },









	{ 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 },









	{ 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 },








@@ -714,8 +721,10 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {







	XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init),









	XBOXONE_INIT_PKT(0x045e, 0x0b00, extra_input_packet_init),









	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_led_on),









	XBOXONE_INIT_PKT(0x0f0d, 0x01b2, xboxone_pdp_led_on),









	XBOXONE_INIT_PKT(0x20d6, 0xa01a, xboxone_pdp_led_on),









	XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_auth),









	XBOXONE_INIT_PKT(0x0f0d, 0x01b2, xboxone_pdp_auth),









	XBOXONE_INIT_PKT(0x20d6, 0xa01a, xboxone_pdp_auth),









	XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),









	XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),








@@ -1027,7 +1036,7 @@ static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned cha







 *	The report format was gleaned from









 *	https://github.com/kylelemons/xbox/blob/master/xbox.go









 */









static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data)









static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data, u32 len)









{









	struct input_dev *dev = xpad->dev;









	bool do_sync = false;








@@ -1068,8 +1077,12 @@ static void xpadone_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char







		/* menu/view buttons */









		input_report_key(dev, BTN_START,  data[4] & BIT(2));









		input_report_key(dev, BTN_SELECT, data[4] & BIT(3));









		if (xpad->mapping & MAP_SELECT_BUTTON)









			input_report_key(dev, KEY_RECORD, data[22] & BIT(0));









		if (xpad->mapping & MAP_SHARE_BUTTON) {









			if (xpad->mapping & MAP_SHARE_OFFSET)









				input_report_key(dev, KEY_RECORD, data[len - 26] & BIT(0));









			else









				input_report_key(dev, KEY_RECORD, data[len - 18] & BIT(0));









		}



















		/* buttons A,B,X,Y */









		input_report_key(dev, BTN_A,	data[4] & BIT(4));








@@ -1217,7 +1230,7 @@ static void xpad_irq_in(struct urb *urb)







		xpad360w_process_packet(xpad, 0, xpad->idata);









		break;









	case XTYPE_XBOXONE:









		xpadone_process_packet(xpad, 0, xpad->idata);









		xpadone_process_packet(xpad, 0, xpad->idata, urb->actual_length);









		break;









	default:









		xpad_process_packet(xpad, 0, xpad->idata);








@@ -1944,7 +1957,7 @@ static int xpad_init_input(struct usb_xpad *xpad)







	    xpad->xtype == XTYPE_XBOXONE) {









		for (i = 0; xpad360_btn[i] >= 0; i++)









			input_set_capability(input_dev, EV_KEY, xpad360_btn[i]);









		if (xpad->mapping & MAP_SELECT_BUTTON)









		if (xpad->mapping & MAP_SHARE_BUTTON)









			input_set_capability(input_dev, EV_KEY, KEY_RECORD);









	} else {









		for (i = 0; xpad_btn[i] >= 0; i++)