[PATCH 0/1] Magic Keyboard 2021 with fingerprint reader FN key mapping

[PATCH 0/1] Magic Keyboard 2021 with fingerprint reader FN key mapping

[José Expósito]

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/20211202061651.115548-1-alexhenrie24@gmail.com/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(-)

-- 
2.25.1

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

[José Expósito]

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.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
 drivers/hid/hid-apple.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 8fcbac7f50ce..24802a4a636e 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -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)
-- 
2.25.1

Re: [PATCH 0/1] Magic Keyboard 2021 with fingerprint reader FN key mapping

[Jiri Kosina]

On Sun, 2 Jan 2022, José Expósito wrote:

> Hi all,
> 
> This patch is meant to be applied after [1] and [2].

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

-- 
Jiri Kosina
SUSE Labs