From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49F67C43219 for ; Thu, 21 Oct 2021 00:25:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38B4161057 for ; Thu, 21 Oct 2021 00:25:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232469AbhJUA1X (ORCPT ); Wed, 20 Oct 2021 20:27:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:45838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231941AbhJUA0S (ORCPT ); Wed, 20 Oct 2021 20:26:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8387161057; Thu, 21 Oct 2021 00:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634775842; bh=IC7UlV2w1e4Ip96/SdkIQOlu48Mr5j18fgcS+51QB6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELlOwj8Hgx5QMUmCba0RPdpmTDcZP9Vpg0B4nlFRu7eTn7saWROlRDu3s9upMo/zb usOeMo+Q1UJFNSlLK7yE0i6I/PjhQVgHsMZih6hiuBk/egjNfSdBNNjtrz5g4dtzAk xlHB/Y3c6vVE7PTjLOFgspApBQDSrrPFjHKKFeEGZI6Pgfl1SMIxcPhk7awPMHGOMM +t+BmfyYCB07n9cA4TggRXlEdNC1NeBPT2ocI8h1+q1nGogaCA3weRX/qpfwVpVgg9 KlH5izLdpG/2FI8iVNCSnZSNtAZIuitKECEFiU1qHkkkTi/Wup+NSrdOjoxH6bZPlq liTZrDSaW9KuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Cullen , Dmitry Torokhov , Sasha Levin , mattreynolds@chromium.org, hcutts@chromium.org, hadess@hadess.net, andrzej.p@collabora.com, lee.jones@linaro.org, sanjay.govind9@gmail.com, benpicco@googlemail.com, lzye@google.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 9/9] Input: xpad - add support for another USB ID of Nacon GC-100 Date: Wed, 20 Oct 2021 20:23:33 -0400 Message-Id: <20211021002333.1129824-9-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021002333.1129824-1-sashal@kernel.org> References: <20211021002333.1129824-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Cullen [ 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 Link: https://lore.kernel.org/r/20211015192051.5196-1-michael@michaelcullen.name Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- 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 4168ed0ef187..f8f6bd92e314 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -348,6 +348,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 } @@ -464,6 +465,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