aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCameron Gutman <aicommander@gmail.com>2017-04-10 23:44:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-21 03:31:19 -0400
commit0ea2dcf1f9e691645c22d9103d699e834a7fb8e6 (patch)
tree1cd74a303ef3b359af5f028b7259cb43b365cf04
parent730fecb3401f8a7cc84e8d7b454976efdfdc65c9 (diff)
Input: xpad - add support for Razer Wildcat gamepad
commit 5376366886251e2f8f248704adb620a4bc4c0937 upstream. Signed-off-by: Cameron Gutman <aicommander@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/input/joystick/xpad.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index bbe15243b8e7..f397a5b6910f 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -201,6 +201,7 @@ static const struct xpad_device {
201 { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, 201 { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
202 { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, 202 { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },
203 { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 }, 203 { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 },
204 { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE },
204 { 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 }, 205 { 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 },
205 { 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, 206 { 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
206 { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 }, 207 { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 },
@@ -329,6 +330,7 @@ static struct usb_device_id xpad_table[] = {
329 XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ 330 XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */
330 XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ 331 XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
331 XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ 332 XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */
333 XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */
332 XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ 334 XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */
333 XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ 335 XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */
334 { } 336 { }