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 779BDC433FE for ; Thu, 21 Oct 2021 00:24:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63A6A6138F for ; Thu, 21 Oct 2021 00:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232114AbhJUA0O (ORCPT ); Wed, 20 Oct 2021 20:26:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:43824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231695AbhJUAZT (ORCPT ); Wed, 20 Oct 2021 20:25:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2BD6C6128B; Thu, 21 Oct 2021 00:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634775784; bh=xslzSI1wRpON29h76Vj++lV2i8HrUlTjprWtcHaSNAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VgkK12XRW4q7khvs+MSw3tDx69KZmAOZRb7RI+KkO9TfSeYTzoBXcytee4SvXYxRu BeUMfj3Mv2T8kJIkn2PuoiL4TXQy7vYBlnhpYXULQGmflhbJ2AjTWSh2UG+8g8tz/k +c8uuFBeQ+S2c3nWMrWKAm9RknrSQLZoWN43QHHR7iwTcEurUfbx9Lv7LiOx4rWs98 DrK85OCBr94zQna0f7iSC9gYOpDjPS5mLYoODn5SNQsS1hLgs/vqzSzPBEIgI8IAGS 0rM/ueDPmUxSWgaRSwczucgWFQHNn7r1AIkmKh/EdQS//BIwqbZRpqzoWNU0gzNy0l Bc/wNQmR8fl3A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Cullen , Dmitry Torokhov , Sasha Levin , 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 Message-Id: <20211021002238.1129482-11-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021002238.1129482-1-sashal@kernel.org> References: <20211021002238.1129482-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-input@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 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