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 AE45C3DABFD; Wed, 25 Sep 2024 12:06:43 +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=1727266003; cv=none; b=C8+xFKDTubCVotQggl4cUoa6ak9oYIN+liLFCuY3+z4Ahv/bOQKIdLOs72PuJnt578iM1HgmVh32sb1Uu1q8nfz1JXfbdF3YH2vj8KCnmyLo1ZaR2Mwuu83qI/kmfNCFnTNJHd7BlOT1Zls5uDz3wHxA1093q+LGK5qgjSUe8So= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727266003; c=relaxed/simple; bh=TljjiKZ7N/qPj75BS0f2OhcIAgkAOQstrVPXOIoA3ns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tux2AhdvYNG/OAIrMRwAHTbFfx6w2PMl9NZYYN312n7FQhWhj9pmjn+tdkgpoTo4UIV/In4Ybepj6Qj9lFFm9wET1RyR4IsnuLWn6ora0/4qgSiSFI85uBB/X93jNBSMQY4dUl/5jlVy5GB/s39qQi/X2mKWQEt4ZogNdm2M5gc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C/jNH+8t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C/jNH+8t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EEFDC4CEC3; Wed, 25 Sep 2024 12:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727266003; bh=TljjiKZ7N/qPj75BS0f2OhcIAgkAOQstrVPXOIoA3ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/jNH+8tMoOL7dEnJ02zKW7joO0Gf7VHjYn5p6eAGgiD8n1AXdfjMNsES+mFr4MGw lev8sekhqVQTvzOSUc9YkcJXd9cSWauYxyJ8erBW1q6GcZcMY8+tCq18RBspicbBqV zmq660SF8Wlb7kZsU5qwrm/8vmCrp4BpUJcFgovEOgtX9gYgzeosFLC6Z+ExH5fMWi DacVD2S9RueV/allsgtrRF+5g4bdXxpTuVd/JV9CL1jknRn46gnqdyG04ZsFvU5Xpw YbgO3oAJiTJytEFsXZ6hKmZBzLkZ06yqCQjLmJAO4YkqZz4J++Fqh9j+Vf6ZFZFT0a 6+mRK2FGOgCOg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vishnu Sankar , Mark Pearson , Jiri Kosina , Sasha Levin , jikos@kernel.org, bentiss@kernel.org, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 145/197] HID: multitouch: Add support for Thinkpad X12 Gen 2 Kbd Portfolio Date: Wed, 25 Sep 2024 07:52:44 -0400 Message-ID: <20240925115823.1303019-145-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925115823.1303019-1-sashal@kernel.org> References: <20240925115823.1303019-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.11 Content-Transfer-Encoding: 8bit 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 72936a523c543..937c1fe518769 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -791,6 +791,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 56fc78841f245..1b0844ffa6df7 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -2081,6 +2081,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