| From e116955d8bfd9e76fd07bb7363ac5c6a16170cec Mon Sep 17 00:00:00 2001 |
| From: Benjamin Valentin <benpicco@googlemail.com> |
| Date: Sun, 7 May 2017 14:49:09 -0700 |
| Subject: Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer |
| Sabertooth |
| |
| [ Upstream commit 4706aa075662fe3cad29c3f49b50878de53f4f3b ] |
| |
| Add USB IDs for two more Xbox 360 controllers. |
| |
| I found them in the pull requests for the xboxdrv userspace driver, which |
| seems abandoned. |
| |
| Thanks to psychogony and mkaito for reporting the IDs there! |
| |
| Signed-off-by: Benjamin Valentin <benpicco@googlemail.com> |
| Reviewed-by: Cameron Gutman <aicommander@gmail.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index 16338f0b004f..def96cd2479b 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -212,10 +212,12 @@ static const struct xpad_device { |
| { 0x162e, 0xbeef, "Joytech Neo-Se Take2", 0, XTYPE_XBOX360 }, |
| { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 }, |
| { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 }, |
| + { 0x1689, 0xfe00, "Razer Sabertooth", 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, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 }, |
| { 0x1bad, 0xf018, "Mad Catz Street Fighter IV SE Fighting Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, |
| + { 0x1bad, 0xf019, "Mad Catz Brawlstick for Xbox 360", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, |
| { 0x1bad, 0xf021, "Mad Cats Ghost Recon FS GamePad", 0, XTYPE_XBOX360 }, |
| { 0x1bad, 0xf023, "MLG Pro Circuit Controller (Xbox)", 0, XTYPE_XBOX360 }, |
| { 0x1bad, 0xf028, "Street Fighter IV FightPad", 0, XTYPE_XBOX360 }, |
| -- |
| 2.17.1 |
| |