Skip to content

Commit 9bbd77d

Browse files
benpiccodtor
authored andcommitted
Input: xpad - sync supported devices with fork on GitHub
There is a fork of this driver on GitHub [0] that has been updated with new device IDs. Merge those into the mainline driver, so the out-of-tree fork is not needed for users of those devices anymore. [0] https://github.com/paroj/xpad Signed-off-by: Benjamin Valentin <[email protected]> Link: https://lore.kernel.org/r/20210121142523.1b6b050f@rechenknecht2k11 Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 5d06f72 commit 9bbd77d

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

drivers/input/joystick/xpad.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,17 @@ static const struct xpad_device {
215215
{ 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
216216
{ 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
217217
{ 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },
218-
{ 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
218+
{ 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
219+
{ 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
220+
{ 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 0, XTYPE_XBOXONE },
219221
{ 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
220222
{ 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE },
223+
{ 0x0e6f, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
224+
{ 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
225+
{ 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
226+
{ 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
227+
{ 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },
228+
{ 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },
221229
{ 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
222230
{ 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },
223231
{ 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -296,6 +304,9 @@ static const struct xpad_device {
296304
{ 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 },
297305
{ 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 },
298306
{ 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 },
307+
{ 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE },
308+
{ 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 },
309+
{ 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
299310
{ 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
300311
{ 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },
301312
{ 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
@@ -429,8 +440,12 @@ static const struct usb_device_id xpad_table[] = {
429440
XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */
430441
XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */
431442
XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */
443+
XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */
444+
XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */
432445
XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */
433446
XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
447+
XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
448+
XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
434449
{ }
435450
};
436451

0 commit comments

Comments
 (0)