aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorRamses Ramírez <ramzeto@gmail.com>2018-09-28 19:59:26 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-10-01 18:58:52 -0400
commit9735082a7cbae572c2eabdc45acecc8c9fa0759b (patch)
tree12f17e7641b6fe7af96b5bc78b43d4683e28f0ba /drivers/input
parent4fef1250eafddc5182cd5c3c354a6971bcf7520d (diff)
Input: xpad - add support for Xbox1 PDP Camo series gamepad
The "Xbox One PDP Wired Controller - Camo series" has a different product-id than the regular PDP controller and the PDP stealth series, but it uses the same initialization sequence. This patch adds the product-id of the camo series to the structures that handle the other PDP Xbox One controllers. Signed-off-by: Ramses Ramírez <ramzeto@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/joystick/xpad.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index cd620e009bad..d4b9db487b16 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -231,6 +231,7 @@ static const struct xpad_device {
231 { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, 231 { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },
232 { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, 232 { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
233 { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, 233 { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
234 { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE },
234 { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, 235 { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
235 { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, 236 { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },
236 { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 }, 237 { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -530,6 +531,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {
530 XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2), 531 XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
531 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1), 532 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
532 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2), 533 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
534 XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),
535 XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),
533 XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), 536 XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
534 XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init), 537 XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
535 XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init), 538 XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),