linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org>,
	linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.12 06/49] HID: hid-input: add mapping for emoji picker key
Date: Mon,  7 Jun 2021 12:11:32 -0400	[thread overview]
Message-ID: <20210607161215.3583176-6-sashal@kernel.org> (raw)
In-Reply-To: <20210607161215.3583176-1-sashal@kernel.org>

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

[ Upstream commit 7b229b13d78d112e2c5d4a60a3c6f602289959fa ]

HUTRR101 added a new usage code for a key that is supposed to invoke and
dismiss an emoji picker widget to assist users to locate and enter emojis.

This patch adds a new key definition KEY_EMOJI_PICKER and maps 0x0c/0x0d9
usage code to this new keycode. Additionally hid-debug is adjusted to
recognize this new usage code as well.

Signed-off-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                | 3 +++
 include/uapi/linux/input-event-codes.h | 1 +
 3 files changed, 5 insertions(+)

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index d7eaf9100370..982737827b87 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -929,6 +929,7 @@ static const char *keys[KEY_MAX + 1] = {
 	[KEY_APPSELECT] = "AppSelect",
 	[KEY_SCREENSAVER] = "ScreenSaver",
 	[KEY_VOICECOMMAND] = "VoiceCommand",
+	[KEY_EMOJI_PICKER] = "EmojiPicker",
 	[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 236bccd37760..e982d8173c9c 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -963,6 +963,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
 		case 0x0cd: map_key_clear(KEY_PLAYPAUSE);	break;
 		case 0x0cf: map_key_clear(KEY_VOICECOMMAND);	break;
+
+		case 0x0d9: map_key_clear(KEY_EMOJI_PICKER);	break;
+
 		case 0x0e0: map_abs_clear(ABS_VOLUME);		break;
 		case 0x0e2: map_key_clear(KEY_MUTE);		break;
 		case 0x0e5: map_key_clear(KEY_BASSBOOST);	break;
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index ee93428ced9a..225ec87d4f22 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -611,6 +611,7 @@
 #define KEY_VOICECOMMAND		0x246	/* Listening Voice Command */
 #define KEY_ASSISTANT		0x247	/* AL Context-aware desktop assistant */
 #define KEY_KBD_LAYOUT_NEXT	0x248	/* AC Next Keyboard Layout Select */
+#define KEY_EMOJI_PICKER	0x249	/* Show/hide emoji picker (HUTRR101) */
 
 #define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */
 #define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */
-- 
2.30.2


  parent reply	other threads:[~2021-06-07 16:12 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-07 16:11 [PATCH AUTOSEL 5.12 01/49] net: ieee802154: fix null deref in parse dev addr Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 02/49] HID: asus: Filter keyboard EC for old ROG keyboard Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 03/49] HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 04/49] HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K15A keyboard-dock Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 05/49] HID: a4tech: use A4_2WHEEL_MOUSE_HACK_B8 for A4TECH NB-95 Sasha Levin
2021-06-07 16:11 ` Sasha Levin [this message]
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 07/49] HID: hid-sensor-hub: Return error for hid_set_field() failure Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 08/49] HID: asus: filter G713/G733 key event to prevent shutdown Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 09/49] HID: quirks: Add quirk for Lenovo optical mouse Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 10/49] HID: multitouch: set Stylus suffix for Stylus-application devices, too Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 11/49] HID: Add BUS_VIRTUAL to hid_connect logging Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 12/49] HID: usbhid: fix info leak in hid_submit_ctrl Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 13/49] mt76: mt7921: fix max aggregation subframes setting Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 14/49] drm/tegra: sor: Do not leak runtime PM reference Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 15/49] gpu: host1x: Split up client initalization and registration Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 16/49] drm/tegra: sor: Fully initialize SOR before registration Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 17/49] hwmon/pmbus: (q54sj108a2) The PMBUS_MFR_ID is actually 6 chars instead of 5 Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 18/49] ARM: OMAP1: Fix use of possibly uninitialized irq variable Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 19/49] ARM: OMAP2+: Fix build warning when mmc_omap is not built Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 20/49] gfs2: Prevent direct-I/O write fallback errors from getting lost Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 21/49] gfs2: fix a deadlock on withdraw-during-mount Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 22/49] gfs2: Clean up revokes on normal withdraws Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 23/49] HID: multitouch: Disable event reporting on suspend on the Asus T101HA touchpad Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 24/49] HID: gt683r: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 25/49] HID: intel-ish-hid: ipc: Add Alder Lake device IDs Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 26/49] riscv: Use -mno-relax when using lld linker Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 27/49] ALSA: hda: Add AlderLake-M PCI ID Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 28/49] mt76: mt7921: remove leftover 80+80 HE capability Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 29/49] gfs2: Fix use-after-free in gfs2_glock_shrink_scan Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 30/49] Bluetooth: use correct lock to prevent UAF of hdev object Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 31/49] scsi: target: core: Fix warning on realtime kernels Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 32/49] ethernet: myri10ge: Fix missing error code in myri10ge_probe() Sasha Levin
2021-06-07 16:11 ` [PATCH AUTOSEL 5.12 33/49] scsi: qedf: Do not put host in qedf_vport_create() unconditionally Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 34/49] Bluetooth: Add a new USB ID for RTL8822CE Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 35/49] scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 36/49] nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 37/49] nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 38/49] nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 39/49] nvme-loop: do not warn for deleted controllers during reset Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 40/49] net: ipconfig: Don't override command-line hostnames or domains Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 41/49] drm/amd/display: Allow bandwidth validation for 0 streams Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 42/49] drm/amdgpu: refine amdgpu_fru_get_product_info Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 43/49] drm/amd/display: Fix overlay validation by considering cursors Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 44/49] drm/amd/display: Fix potential memory leak in DMUB hw_init Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 45/49] drm/amd/amdgpu:save psp ring wptr to avoid attack Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 46/49] rtnetlink: Fix missing error code in rtnl_bridge_notify() Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 47/49] net/x25: Return the correct errno code Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 48/49] net: " Sasha Levin
2021-06-07 16:12 ` [PATCH AUTOSEL 5.12 49/49] fib: " 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=20210607161215.3583176-6-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --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;
as well as URLs for NNTP newsgroup(s).