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 5AEAD2022D7; Mon, 28 Oct 2024 10:53:21 +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=1730112801; cv=none; b=Pcw1DjCHpSYrJE9qX9EWI2fwuSexvY6yL0FKLe9uaaSAcbxa+7kVPZs+3B57AsWJpcsx+idIm9QiUosc5WsuTxOUz9QxAeESZ0L5D7/n6LU1XaQAC4ry9AkAoMYOeoZH9eZ+K8WHB3kqnSh5y8kMmFChQV5QOUtty0X5SUTeC68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730112801; c=relaxed/simple; bh=NMNLN7sXc/om2JXSwuJhk7kn87fYGuE/7xqufaL4Q8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=itE1EbmKHzwKwJ7q5h5fNftosmZLMHp92ehr5QlIBC2dw2phVwBpEccCSaj8L3UU2eci/F7w3+DcfNy1On3wClQwBh0ZBknQVdH4EXYtkPo6GU+Yy4CuwTeELgtQbi3vWtdDE7I+p6qptJ7bAfvnk6+jOU7e0/8FmIt7QdMCtEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R0ZbTQYD; 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="R0ZbTQYD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29A70C4CEC3; Mon, 28 Oct 2024 10:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730112801; bh=NMNLN7sXc/om2JXSwuJhk7kn87fYGuE/7xqufaL4Q8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0ZbTQYDaPIbb59LrSVbiFr479RNeOsqrJczeeM840eIv1Y1TzYthQdepFWdvLHcW nqwGgLt7beLrH2eZb7pSbEHEJXHCY4wQkFKQwKcY3vPuhXprn41zpDJlGSn8zH25zd Q6dMzTsx8GPO/TKQBqKS9tKPPrXGH32rM6W5Hj2ozF0JhFCa5sMk+gWHVZqmBwhvcL ulPaTxm9i9xcsj+jyMdIlRn8z5NBKeVFAU6IOZsVQJbEuYuyJM748cQi8mhNwqf3zH S2kZqRmn5V5vJaqGPnWzxNrdNZX2XabLeVC/hWoS7TrHG+L+tRTnev8TxGyx/oFiPQ ZGzXZf9af057Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans de Goede , Izhar Firdaus , Jiri Kosina , Sasha Levin , jikos@kernel.org, bentiss@kernel.org, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 5/7] HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard Date: Mon, 28 Oct 2024 06:53:07 -0400 Message-ID: <20241028105311.3560419-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241028105311.3560419-1-sashal@kernel.org> References: <20241028105311.3560419-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 5.15.169 Content-Transfer-Encoding: 8bit From: Hans de Goede [ Upstream commit 51268879eb2bfc563a91cdce69362d9dbf707e7e ] The Thinkpad X1 Tablet Gen 3 keyboard has the same Lenovo specific quirks as the original Thinkpad X1 Tablet keyboard. Add the PID for the "Thinkpad X1 Tablet Gen 3 keyboard" to the hid-lenovo driver to fix the FnLock, Mute and media buttons not working. Suggested-by: Izhar Firdaus Closes https://bugzilla.redhat.com/show_bug.cgi?id=2315395 Signed-off-by: Hans de Goede Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-lenovo.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index 44fd4a05ace38..9536f468b42c5 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -343,6 +343,7 @@ static int lenovo_input_mapping(struct hid_device *hdev, return lenovo_input_mapping_tp10_ultrabook_kbd(hdev, hi, field, usage, bit, max); case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: return lenovo_input_mapping_x1_tab_kbd(hdev, hi, field, usage, bit, max); default: return 0; @@ -431,6 +432,7 @@ static ssize_t attr_fn_lock_store(struct device *dev, break; case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: ret = lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, value); if (ret) return ret; @@ -614,6 +616,7 @@ static int lenovo_event(struct hid_device *hdev, struct hid_field *field, return lenovo_event_cptkbd(hdev, field, usage, value); case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: return lenovo_event_tp10ubkbd(hdev, field, usage, value); default: return 0; @@ -896,6 +899,7 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev, break; case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: ret = lenovo_led_set_tp10ubkbd(hdev, tp10ubkbd_led[led_nr], value); break; } @@ -1136,6 +1140,7 @@ static int lenovo_probe(struct hid_device *hdev, break; case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: ret = lenovo_probe_tp10ubkbd(hdev); break; default: @@ -1202,6 +1207,7 @@ static void lenovo_remove(struct hid_device *hdev) break; case USB_DEVICE_ID_LENOVO_TP10UBKBD: case USB_DEVICE_ID_LENOVO_X1_TAB: + case USB_DEVICE_ID_LENOVO_X1_TAB3: lenovo_remove_tp10ubkbd(hdev); break; } @@ -1247,6 +1253,8 @@ static const struct hid_device_id lenovo_devices[] = { */ { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB3) }, { } }; -- 2.43.0