| From 56aa58b306d420a2f27b3f26e5cd24226760f005 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ramses=20Ram=C3=ADrez?= <ramzeto@gmail.com> |
| Date: Fri, 28 Sep 2018 16:59:26 -0700 |
| Subject: Input: xpad - add support for Xbox1 PDP Camo series gamepad |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| [ Upstream commit 9735082a7cbae572c2eabdc45acecc8c9fa0759b ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index 69b44aebaf01..2e52015634f9 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -234,6 +234,7 @@ static const struct xpad_device { |
| { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, |
| + { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, |
| { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, |
| { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 }, |
| @@ -533,6 +534,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { |
| XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2), |
| XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1), |
| XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2), |
| + XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1), |
| + XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2), |
| XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), |
| XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init), |
| XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init), |
| -- |
| 2.17.1 |
| |
