linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Michael Cullen <michael@michaelcullen.name>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Sasha Levin <sashal@kernel.org>,
	hadess@hadess.net, andrzej.p@collabora.com,
	olivier.crete@ocrete.ca, lee.jones@linaro.org,
	benpicco@googlemail.com, sanjay.govind9@gmail.com,
	lzye@google.com, mattreynolds@chromium.org,
	linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 11/11] Input: xpad - add support for another USB ID of Nacon GC-100
Date: Wed, 20 Oct 2021 20:22:37 -0400	[thread overview]
Message-ID: <20211021002238.1129482-11-sashal@kernel.org> (raw)
In-Reply-To: <20211021002238.1129482-1-sashal@kernel.org>

From: Michael Cullen <michael@michaelcullen.name>

[ Upstream commit 3378a07daa6cdd11e042797454c706d1c69f9ca6 ]

The Nacon GX100XF is already mapped, but it seems there is a Nacon
GC-100 (identified as NC5136Wht PCGC-100WHITE though I believe other
colours exist) with a different USB ID when in XInput mode.

Signed-off-by: Michael Cullen <michael@michaelcullen.name>
Link: https://lore.kernel.org/r/20211015192051.5196-1-michael@michaelcullen.name
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 e5f1e3cf9179..ba101afcfc27 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -331,6 +331,7 @@ static const struct xpad_device {
 	{ 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 },
 	{ 0x24c6, 0x5d04, "Razer Sabertooth", 0, XTYPE_XBOX360 },
 	{ 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
+	{ 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 },
 	{ 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX },
 	{ 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
 	{ 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
@@ -447,6 +448,7 @@ static const struct usb_device_id xpad_table[] = {
 	XPAD_XBOXONE_VENDOR(0x24c6),		/* PowerA Controllers */
 	XPAD_XBOXONE_VENDOR(0x2e24),		/* Hyperkin Duke X-Box One pad */
 	XPAD_XBOX360_VENDOR(0x2f24),		/* GameSir Controllers */
+	XPAD_XBOX360_VENDOR(0x3285),		/* Nacon GC-100 */
 	{ }
 };
 
-- 
2.33.0


      parent reply	other threads:[~2021-10-21  0:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-21  0:22 [PATCH AUTOSEL 5.4 01/11] gcc-plugins/structleak: add makefile var for disabling structleak Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 02/11] btrfs: deal with errors when checking if a dir entry exists during log replay Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 03/11] net: stmmac: add support for dwmac 3.40a Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 04/11] ARM: dts: spear3xx: Fix gmac node Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 05/11] nfc: nci: fix the UAF of rf_conn_info object Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 06/11] isdn: cpai: check ctr->cnr to avoid array index out of bound Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 07/11] isdn: mISDN: Fix sleeping function called from invalid context Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 08/11] platform/x86: intel_scu_ipc: Update timeout value in comment Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 09/11] ALSA: hda: avoid write to STATESTS if controller is in reset Sasha Levin
2021-10-21  0:22 ` [PATCH AUTOSEL 5.4 10/11] Input: snvs_pwrkey - add clk handling Sasha Levin
2021-10-21  0:22 ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211021002238.1129482-11-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=andrzej.p@collabora.com \
    --cc=benpicco@googlemail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=hadess@hadess.net \
    --cc=lee.jones@linaro.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lzye@google.com \
    --cc=mattreynolds@chromium.org \
    --cc=michael@michaelcullen.name \
    --cc=olivier.crete@ocrete.ca \
    --cc=sanjay.govind9@gmail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).