Commit 1767f8bf authored by Pierre-Loup A. Griffais's avatar Pierre-Loup A. Griffais Committed by Wen Zhiwei
Browse files

Input: xpad - add QH Electronics VID/PID 

stable inclusion
from stable-v6.6.75
commit 723aa536831c5169ca9edafd8921911bf7e1b316
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=723aa536831c5169ca9edafd8921911bf7e1b316



--------------------------------

commit 92600f3295ff571890c981d886c6544030cc05f3 upstream.

Add support for QH Electronics Xbox 360-compatible controller

Signed-off-by: default avatarPierre-Loup A. Griffais <pgriffais@valvesoftware.com>
Signed-off-by: default avatarVicki Pfau <vi@endrift.com>
Link: https://lore.kernel.org/r/20250116012518.3476735-1-vi@endrift.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 43b2f114

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static const struct xpad_device { 
	{ 0x1689, 0xfe00, "Razer Sabertooth", 0, XTYPE_XBOX360 },

	{ 0x17ef, 0x6182, "Lenovo Legion Controller for Windows", 0, XTYPE_XBOX360 },

	{ 0x1949, 0x041a, "Amazon Game Controller", 0, XTYPE_XBOX360 },

	{ 0x1a86, 0xe310, "QH Electronics Controller", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },

	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x1bad, 0x0130, "Ion Drum Rocker", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
@@ -515,6 +516,7 @@ static const struct usb_device_id xpad_table[] = { 
	XPAD_XBOX360_VENDOR(0x1689),		/* Razer Onza */

	XPAD_XBOX360_VENDOR(0x17ef),		/* Lenovo */

	XPAD_XBOX360_VENDOR(0x1949),		/* Amazon controllers */

	XPAD_XBOX360_VENDOR(0x1a86),		/* QH Electronics */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harmonix Rock Band guitar and drums */

	XPAD_XBOX360_VENDOR(0x20d6),		/* PowerA controllers */

	XPAD_XBOXONE_VENDOR(0x20d6),		/* PowerA controllers */