From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jingyuan Liang <jingyliang@chromium.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org>,
jikos@kernel.org, benjamin.tissoires@redhat.com,
linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 03/15] HID: Add Mapping for System Microphone Mute
Date: Sun, 26 Feb 2023 21:10:22 -0500 [thread overview]
Message-ID: <20230227021038.1052958-3-sashal@kernel.org> (raw)
In-Reply-To: <20230227021038.1052958-1-sashal@kernel.org>
From: Jingyuan Liang <jingyliang@chromium.org>
[ Upstream commit 2d60f9f4f26785a00273cb81fe60eff129ebd449 ]
HUTRR110 added a new usage code for a key that is supposed to
mute/unmute microphone system-wide.
Map the new usage code(0x01 0xa9) to keycode KEY_MICMUTE.
Additionally hid-debug is adjusted to recognize this keycode as well.
Signed-off-by: Jingyuan Liang <jingyliang@chromium.org>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hid/hid-debug.c | 1 +
drivers/hid/hid-input.c | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 419d8dec7e498..0066eab60576c 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -933,6 +933,7 @@ static const char *keys[KEY_MAX + 1] = {
[KEY_VOICECOMMAND] = "VoiceCommand",
[KEY_EMOJI_PICKER] = "EmojiPicker",
[KEY_DICTATE] = "Dictate",
+ [KEY_MICMUTE] = "MicrophoneMute",
[KEY_BRIGHTNESS_MIN] = "BrightnessMin",
[KEY_BRIGHTNESS_MAX] = "BrightnessMax",
[KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d1ba6fafe960f..004aa3cdeacc7 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -671,6 +671,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
break;
}
+ if ((usage->hid & 0xf0) == 0xa0) { /* SystemControl */
+ switch (usage->hid & 0xf) {
+ case 0x9: map_key_clear(KEY_MICMUTE); break;
+ default: goto ignore;
+ }
+ break;
+ }
+
if ((usage->hid & 0xf0) == 0xb0) { /* SC - Display */
switch (usage->hid & 0xf) {
case 0x05: map_key_clear(KEY_SWITCHVIDEOMODE); break;
--
2.39.0
next prev parent reply other threads:[~2023-02-27 2:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 2:10 [PATCH AUTOSEL 5.4 01/15] drm/amd/display: Fix potential null-deref in dm_resume Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 02/15] drm/omap: dsi: Fix excessive stack usage Sasha Levin
2023-02-27 2:10 ` Sasha Levin [this message]
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 04/15] drm/radeon: free iio for atombios when driver shutdown Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 05/15] drm/msm/dsi: Add missing check for alloc_ordered_workqueue Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 06/15] docs/scripts/gdb: add necessary make scripts_gdb step Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 07/15] ASoC: kirkwood: Iterate over array indexes instead of using pointer math Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 08/15] regulator: max77802: Bounds check regulator id against opmode Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 09/15] regulator: s5m8767: Bounds check id indexing into arrays Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 10/15] hwmon: (coretemp) Simplify platform device handling Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 11/15] pinctrl: at91: use devm_kasprintf() to avoid potential leaks Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 12/15] drm: panel-orientation-quirks: Add quirk for Lenovo IdeaPad Duet 3 10IGL5 Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 13/15] dm thin: add cond_resched() to various workqueue loops Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 14/15] dm cache: " Sasha Levin
2023-02-27 2:10 ` [PATCH AUTOSEL 5.4 15/15] nfsd: zero out pointers after putting nfsd_files on COPY setup error Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227021038.1052958-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jikos@kernel.org \
--cc=jingyliang@chromium.org \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox