Skip to contentSkip to conversation

Magic Keyboard 2021 with fingerprint reader FN key mapping

PATCH Applied José Expósito 2 participants 3 messages Jan 2, 2022 – Jan 6, 2022 HID

lore
Share & tools
lore
#0 lore raw

cover Magic Keyboard 2021 with fingerprint reader FN key mapping

Hi all,

This patch is meant to be applied after [1] and [2].

Thanks a lot in advance,
José Expósito

[1] https://lore.kernel.org/linux-input/[email protected]/T/
[2] https://lore.kernel.org/linux-input/CAMMLpeSdmc1Ti4EZ9Tm7eq3a3+u46TEMWSaqD=USSnSRnZMYTg@mail.gmail.com/T/

José Expósito (1):
HID: apple: Add Magic Keyboard 2021 with fingerprint reader FN key
mapping

 drivers/hid/hid-apple.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 HID: apple: Add Magic Keyboard 2021 with fingerprint reader FN key mapping

Use the function key table introduced for the Magic Keyboard 2021 without fingerprint reader in the models with fingerprint reader and/or numpad.

Tested with the ANSI variant of the keyboard with and without numpad.

---
 drivers/hid/hid-apple.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/hid-apple.c +3 -1
index 8fcbac7f50ce..24802a4a636e 100644
@@ -242,7 +242,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
 	}
 
 	if (fnmode) {
-		if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021)
+		if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 ||
+		    hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 ||
+		    hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
 			table = apple2021_fn_keys;
 		else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&
 				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)
Signature · 1 line
2.25.1
maintainer Applied
#2 lore raw
In reply to José Expósito
Quoted 3 lines · José Expósito

Hi all,

This patch is meant to be applied after [1] and [2].

Applied, together with Benjamin's original 2021 keyboard mappings.

Signature · 2 lines
Jiri Kosina
SUSE Labs