From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7945F1DC9A7; Wed, 19 Mar 2025 14:38:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395100; cv=none; b=oz4ziYtm75Phe3QmbLCWZT6gGLGL/zuV2hjvPxpKvaZbcielePR7IUQthu2CsrWd9KRTUE1vU/jh6OWiUevpxuD4wRUd3Mp1vwRj8v1GkiatY4oRLXP9N3aPgPwBOKlhZQcxQFL+CyOrR2Y/pwTYRPm1cLkMoWn+aBA0hzkppfQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395100; c=relaxed/simple; bh=YzWovWffZm/pMj4WqISBQXguPoDk7ffy1RIWYGTJe/Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CcFnVD4P+e7+6kh5+/GN37d/AAP23RHYDpm6Vo2Uc15y5Lr8KzglBL7dnZAUfuhAeefHBLwYevkWHCnX+qLi/Ux1OO+TBUnvy96h74oVpX5HyE8uGR8Pon2MiapQMdxIcRyAsAMeaGc8AmH/LH6/79Gso4aQL5R2eyb8Fk/pS8Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RKCWQLJF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RKCWQLJF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D438C4CEE4; Wed, 19 Mar 2025 14:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395100; bh=YzWovWffZm/pMj4WqISBQXguPoDk7ffy1RIWYGTJe/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RKCWQLJFKGAaM7SibUA3AO96LPVwCGNzuEvvqovYgiSzKDgfgY5epCt3skTxVw/KV 3oQGG07UiMIqM6aMCL65Zxw62Zgb+1lIT1IMw96sERcZ2wIv7pe6aLnl5vxc3PPMMa o1gUc5jWnPT7m8X19zizPUJaGIEO1/i73kEyzSLw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Antheas Kapenekakis , Dmitry Torokhov Subject: [PATCH 6.12 151/231] Input: xpad - add support for ZOTAC Gaming Zone Date: Wed, 19 Mar 2025 07:30:44 -0700 Message-ID: <20250319143030.568701460@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143026.865956961@linuxfoundation.org> References: <20250319143026.865956961@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Antheas Kapenekakis commit 709329c48214ad2acf12eed1b5c0eb798e40a64c upstream. ZOTAC Gaming Zone is ZOTAC's 2024 handheld release. As it is common with these handhelds, it uses a hybrid USB device with an xpad endpoint, a keyboard endpoint, and a vendor-specific endpoint for RGB control et al. Signed-off-by: Antheas Kapenekakis Link: https://lore.kernel.org/r/20250222170010.188761-2-lkml@antheas.dev Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -349,6 +349,7 @@ static const struct xpad_device { { 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 }, + { 0x1ee9, 0x1590, "ZOTAC Gaming Zone", 0, XTYPE_XBOX360 }, { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, { 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, XTYPE_XBOXONE }, { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, @@ -538,6 +539,7 @@ static const struct usb_device_id xpad_t XPAD_XBOX360_VENDOR(0x1949), /* Amazon controllers */ XPAD_XBOX360_VENDOR(0x1a86), /* QH Electronics */ XPAD_XBOX360_VENDOR(0x1bad), /* Harmonix Rock Band guitar and drums */ + XPAD_XBOX360_VENDOR(0x1ee9), /* ZOTAC Technology Limited */ XPAD_XBOX360_VENDOR(0x20d6), /* PowerA controllers */ XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA controllers */ XPAD_XBOX360_VENDOR(0x2345), /* Machenike Controllers */