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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AEB6CDB47E for ; Wed, 18 Oct 2023 14:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbjJROMX (ORCPT ); Wed, 18 Oct 2023 10:12:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235199AbjJROML (ORCPT ); Wed, 18 Oct 2023 10:12:11 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D9B912D; Wed, 18 Oct 2023 07:11:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9A0CC433C8; Wed, 18 Oct 2023 14:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638315; bh=ZdE/+Wi7kowc42dVlvNo1gm7hHy7ZdYIidGafejPTVg=; h=From:To:Cc:Subject:Date:From; b=k2AohL2QX2tXd642Vy/qxOABhL0exebAj+onZDgj/B13U24Z2LNnPUU5GNRJzwC4j WxOKkx4c2v+0uNV9m3Ihe2T5O5X7c8wizdfb1qdjXZu9MClNEn2NzhjRR+8PrGrKeQ 3lacmh+S87RO7NzsL0KTqkAv0yblijl3YFK4SdfGd2NfyKkFrLLy3ZrNAW+HY+O82x O8zH+8je8wanApqT3kvSsSvTl9Y7H6nvawv81BmsOh59zKCNv7F/2AH8iH4vSwZjWo fUaOj9FRJc85I8bSu608Cas9TJSz/PpFnfBkRB+s+ivQI7Mjc/k2eKgF5+GDxy9MI4 wRnAPCiTFO7Ng== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Nguyen , Chris Toledanes , Carl Ng , Rahul Rameshbabu , Dmitry Torokhov , Sasha Levin , vi@endrift.com, swyterzone@gmail.com, doublej472@gmail.com, pgriffais@valvesoftware.com, slouken@libsdl.org, matthias.benkmann@gmail.com, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 01/31] Input: xpad - add HyperX Clutch Gladiate Support Date: Wed, 18 Oct 2023 10:11:18 -0400 Message-Id: <20231018141151.1334501-1-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.7 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Max Nguyen [ Upstream commit e28a0974d749e5105d77233c0a84d35c37da047e ] Add HyperX controller support to xpad_device and xpad_table. Suggested-by: Chris Toledanes Reviewed-by: Carl Ng Signed-off-by: Max Nguyen Reviewed-by: Rahul Rameshbabu Link: https://lore.kernel.org/r/20230906231514.4291-1-hphyperxdev@gmail.com 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 cdb193317c3b6..1e377d040c435 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -130,6 +130,7 @@ static const struct xpad_device { { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, + { 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE }, { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, @@ -457,6 +458,7 @@ static const struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* Xbox USB-IF not-approved class */ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 controller */ XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ + XPAD_XBOXONE_VENDOR(0x03f0), /* HP HyperX Xbox One controllers */ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster Xbox 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft Xbox 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft Xbox One controllers */ -- 2.40.1