Skip to content

Commit 9f92d61

Browse files
alexhenrieJiri Kosina
authored andcommitted
HID: apple: Add 2021 Magic Keyboard with fingerprint reader
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Tested-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent 6e14329 commit 9f92d61

3 files changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/hid/hid-apple.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,10 @@ static const struct hid_device_id apple_devices[] = {
722722
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
723723
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),
724724
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
725+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
726+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
727+
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
728+
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
725729

726730
{ }
727731
};

drivers/hid/hid-ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
176176
#define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
177177
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c
178+
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a
178179

179180
#define USB_VENDOR_ID_ASUS 0x0486
180181
#define USB_DEVICE_ID_ASUS_T91MT 0x0185

drivers/hid/hid-quirks.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
303303
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
304304
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
305305
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) },
306+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) },
306307
#endif
307308
#if IS_ENABLED(CONFIG_HID_APPLEIR)
308309
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },

0 commit comments

Comments
 (0)