Commit b9a6139d authored Jan 17, 2025 by Matheos Mattsson Committed by Wen Zhiwei Mar 21, 2025

Input: xpad - add support for Nacon Evol-X Xbox One Controller

stable inclusion
from stable-v6.6.75
commit 7c477b26d39ed72ff3e996613d8191350f423f42
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=7c477b26d39ed72ff3e996613d8191350f423f42



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

commit 3a6e5ed2372bcb2a3c554fda32419efd91ff9b0c upstream.

Add Nacon Evol-X Xbox One to the list of supported devices.

Signed-off-by: Matheos Mattsson <matheos.mattsson@gmail.com>
Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com>
Link: https://lore.kernel.org/r/20250107192830.414709-9-rojtberg@gmail.com


Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent 75347624

drivers/input/joystick/xpad.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,7 @@ static const struct xpad_device {
		{ 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 },
		{ 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
		{ 0x3285, 0x0646, "Nacon Pro Compact", 0, XTYPE_XBOXONE },
		{ 0x3285, 0x0663, "Nacon Evol-X", 0, XTYPE_XBOXONE },
		{ 0x3537, 0x1004, "GameSir T4 Kaleid", 0, XTYPE_XBOX360 },
		{ 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX },
		{ 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
		@@ -532,6 +533,7 @@ static const struct usb_device_id xpad_table[] = {
		XPAD_XBOX360_VENDOR(0x2f24), /* GameSir controllers */
		XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */
		XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */
		XPAD_XBOXONE_VENDOR(0x3285), /* Nacon Evol-X */
		XPAD_XBOX360_VENDOR(0x3537), /* GameSir Controllers */
		XPAD_XBOXONE_VENDOR(0x3537), /* GameSir Controllers */
		{ }