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 29E861DEFC8; Tue, 8 Oct 2024 13:17:19 +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=1728393439; cv=none; b=rDQxlVr5sABLoCL4bi5G0GfHwelVKIcf3m4ziqYbE+3xSgr3I4XEl+AjHYy7EJV3aH3qQxIMICmlszzWpFyOobHbp76ghFicyfzStOInRfUUhrTgaFtVtGVu1+lgFrCPr82QHyca+nqywla7bWCp/oVyHhSg0Vj/B7KjFa0/sB8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393439; c=relaxed/simple; bh=3w4ILB3q3ZNUWWj6zXY1vKS25vDi6+kA+R9Dh/Rfrjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XVYBBUEgYvoaWB0rOgH2JG7OjzrXB6v0dLrZ+EmynzWE2Gde6Y6GY8uKdqM9pjkfqzZ7TTBsAtKz6Y0dK/ald5e+6r50kH3Lwes1Nz9WjOOcyoMKxwz0HnWZ6eOF2zRp6ONEo+tXjcaejeVNcgq6ad+ESNbsOvxP14er9WxlCjs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0LvclhIL; 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="0LvclhIL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A42FFC4CEC7; Tue, 8 Oct 2024 13:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728393439; bh=3w4ILB3q3ZNUWWj6zXY1vKS25vDi6+kA+R9Dh/Rfrjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0LvclhILH+v1q6ZOWcVQV8WNGZL8XmVwWS4txhYC7KOiN5kxJ0wBgWZ5Qu00BD4rV Z1OeyS7a9Wn1Lu9hEIHv0+QyO3LCbmza3iM0fyj++Ua6TUypVzdYGFVHFNay6qc9ja PKhJ/Eo7qgqXy70quhAK4l1Eeo8V5VncSZzds4kU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vishnu Sankar , Mark Pearson , Jiri Kosina , Sasha Levin Subject: [PATCH 6.6 151/386] HID: multitouch: Add support for Thinkpad X12 Gen 2 Kbd Portfolio Date: Tue, 8 Oct 2024 14:06:36 +0200 Message-ID: <20241008115635.369438198@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115629.309157387@linuxfoundation.org> References: <20241008115629.309157387@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vishnu Sankar [ Upstream commit 65b72ea91a257a5f0cb5a26b01194d3dd4b85298 ] This applies similar quirks used by previous generation device, so that Trackpoint and buttons on the touchpad works. New USB KBD PID 0x61AE for Thinkpad X12 Tab is added. Signed-off-by: Vishnu Sankar Reviewed-by: Mark Pearson Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-multitouch.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 674e03fa5f81f..f2e8fb357590f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -788,6 +788,7 @@ #define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3 #define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5 #define USB_DEVICE_ID_LENOVO_X12_TAB 0x60fe +#define USB_DEVICE_ID_LENOVO_X12_TAB2 0x61ae #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E 0x600e #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D 0x608d #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_6019 0x6019 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 8ef41d6e71d42..6d76463f5896f 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -2116,6 +2116,12 @@ static const struct hid_device_id mt_devices[] = { USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X12_TAB) }, + /* Lenovo X12 TAB Gen 2 */ + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU, + HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8, + USB_VENDOR_ID_LENOVO, + USB_DEVICE_ID_LENOVO_X12_TAB2) }, + /* Logitech devices */ { .driver_data = MT_CLS_NSMU, HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH_WIN_8, -- 2.43.0