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 C37FF1E5707; Mon, 21 Oct 2024 10:29:44 +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=1729506584; cv=none; b=MDoFaVUenI3Qqj2jViZmMd4Qh9XUm7K/0WHzlu4Lj+FeVYTQrXNT1EoZmCaqp3lrj9iU/UlRDX86V9TBMUUpM3IwLwLVTnAFLpiUGT6HTKAh23+5lsuZfNAT6Wa3cfJWrPn84wfgoP+wEwCy7p5zO/ZfiijJyZr4Cy75iqsiK5Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729506584; c=relaxed/simple; bh=eB4XZ5RfZ4jhdeNLgCQntCSyR4wZYuq3+Lt6mHZtllM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pa4y+fxoqbpfDrmjKdH4QptgNPhI6K40VP7QrpxV8F2ufePydNRdEFv4T4gDX454SF6KXqnEoMywWpgpFhn12XlxF0xCwS/mzusebXj1kJMxBbbcclu8WHs3UoHFJtuRAAjc6HJQRt5oiI9jR0mbR1H4Ngt1B3DL2PE62o+hGqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2gAUe6QR; 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="2gAUe6QR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEEE6C4CEC3; Mon, 21 Oct 2024 10:29:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1729506584; bh=eB4XZ5RfZ4jhdeNLgCQntCSyR4wZYuq3+Lt6mHZtllM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2gAUe6QRx5rf2gRBcaJxTHo6GrCESlFY3rNmPesJbffr0X4qR12gAIA1BjUjwhtIi bAR7tXFHVlWwC+Da/HvmRO86U3KxKwBZkuj3fOg91Knz8giMoeQdE674XT4P8lJrS0 ixkEMgE/aYE0FbU+MwgAmxCKKekXqHai5sIB3gn4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, John Edwards , "Derek J. Clark" , Christopher Snowhill , Dmitry Torokhov Subject: [PATCH 6.11 054/135] Input: xpad - add support for MSI Claw A1M Date: Mon, 21 Oct 2024 12:23:30 +0200 Message-ID: <20241021102301.443196293@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241021102259.324175287@linuxfoundation.org> References: <20241021102259.324175287@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: John Edwards commit 22a18935d7d96bbb1a28076f843c1926d0ba189e upstream. Add MSI Claw A1M controller to xpad_device match table when in xinput mode. Add MSI VID as XPAD_XBOX360_VENDOR. Signed-off-by: John Edwards Reviewed-by: Derek J. Clark Reviewed-by: Christopher Snowhill Link: https://lore.kernel.org/r/20241010232020.3292284-4-uejji@uejji.net 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 @@ -218,6 +218,7 @@ static const struct xpad_device { { 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX }, { 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX }, { 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, + { 0x0db0, 0x1901, "Micro Star International Xbox360 Controller for Windows", 0, XTYPE_XBOX360 }, { 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX }, { 0x0e4c, 0x1103, "Radica Gamester Reflex", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX }, { 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX }, @@ -493,6 +494,7 @@ static const struct usb_device_id xpad_t XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz Gamepad */ XPAD_XBOXONE_VENDOR(0x0b05), /* ASUS controllers */ XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */ + XPAD_XBOX360_VENDOR(0x0db0), /* Micro Star International X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f Xbox 360 controllers */ XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f Xbox One controllers */ XPAD_XBOX360_VENDOR(0x0f0d), /* Hori controllers */