From: Greg Kroah-Hartman Date: Sun, 3 Dec 2023 13:58:00 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.14.332~32 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ac9298fd6e38aab54fdb8d05c6ec14d684ada04;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: input-xpad-add-hyperx-clutch-gladiate-support.patch --- diff --git a/queue-5.4/input-xpad-add-hyperx-clutch-gladiate-support.patch b/queue-5.4/input-xpad-add-hyperx-clutch-gladiate-support.patch new file mode 100644 index 00000000000..855239e82fa --- /dev/null +++ b/queue-5.4/input-xpad-add-hyperx-clutch-gladiate-support.patch @@ -0,0 +1,40 @@ +From e28a0974d749e5105d77233c0a84d35c37da047e Mon Sep 17 00:00:00 2001 +From: Max Nguyen +Date: Sun, 17 Sep 2023 22:21:53 -0700 +Subject: Input: xpad - add HyperX Clutch Gladiate Support + +From: Max Nguyen + +commit e28a0974d749e5105d77233c0a84d35c37da047e upstream. + +Add HyperX controller support to xpad_device and xpad_table. + +Suggested-by: Chris Toledanes +Reviewed-by: Carl Ng +Signed-off-by: Max Nguyen +Reviewed-by: Rahul Rameshbabu +Link: https://lore.kernel.org/r/20230906231514.4291-1-hphyperxdev@gmail.com +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/joystick/xpad.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/input/joystick/xpad.c ++++ b/drivers/input/joystick/xpad.c +@@ -119,6 +119,7 @@ static const struct xpad_device { + { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, + { 0x044f, 0x0f10, "Thrustmaster Modena GT Wheel", 0, XTYPE_XBOX }, + { 0x044f, 0xb326, "Thrustmaster Gamepad GP XID", 0, XTYPE_XBOX360 }, ++ { 0x03f0, 0x0495, "HyperX Clutch Gladiate", 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 }, +@@ -431,6 +432,7 @@ static const struct usb_device_id xpad_t + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ + XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ + XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ ++ XPAD_XBOXONE_VENDOR(0x03f0), /* HP HyperX Xbox One Controllers */ + XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ + XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ + XPAD_XBOX360_VENDOR(0x046d), /* Logitech X-Box 360 style controllers */ diff --git a/queue-5.4/series b/queue-5.4/series index 79ecd60b59d..e7dfb207e67 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -63,3 +63,4 @@ btrfs-add-dmesg-output-for-first-mount-and-last-unmount-of-a-filesystem.patch btrfs-fix-off-by-one-when-checking-chunk-map-includes-logical-address.patch btrfs-send-ensure-send_fd-is-writable.patch btrfs-make-error-messages-more-clear-when-getting-a-chunk-map.patch +input-xpad-add-hyperx-clutch-gladiate-support.patch