* [PATCH 1/2] HID: apple: Add 2021 Magic Keyboard with fingerprint reader
@ 2021-12-02 6:16 Alex Henrie
2021-12-02 6:16 ` [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad Alex Henrie
0 siblings, 1 reply; 4+ messages in thread
From: Alex Henrie @ 2021-12-02 6:16 UTC (permalink / raw)
To: linux-input, jikos, benjamin, bberg, jose.exposito89; +Cc: Alex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
drivers/hid/hid-apple.c | 4 ++++
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-quirks.c | 1 +
3 files changed, 6 insertions(+)
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 2c9c5faa74a9..b2d8bcd86bd5 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -640,6 +640,10 @@ static const struct hid_device_id apple_devices[] = {
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
{ }
};
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 96a455921c67..8c70a731ef46 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -175,6 +175,7 @@
#define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
#define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c
+#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a
#define USB_VENDOR_ID_ASUS 0x0486
#define USB_DEVICE_ID_ASUS_T91MT 0x0185
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 06b7908c874c..319bbae7ff62 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -303,6 +303,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) },
#endif
#if IS_ENABLED(CONFIG_HID_APPLEIR)
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad
2021-12-02 6:16 [PATCH 1/2] HID: apple: Add 2021 Magic Keyboard with fingerprint reader Alex Henrie
@ 2021-12-02 6:16 ` Alex Henrie
2022-01-02 17:20 ` José Expósito
0 siblings, 1 reply; 4+ messages in thread
From: Alex Henrie @ 2021-12-02 6:16 UTC (permalink / raw)
To: linux-input, jikos, benjamin, bberg, jose.exposito89; +Cc: Alex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
drivers/hid/hid-apple.c | 4 ++++
drivers/hid/hid-ids.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index b2d8bcd86bd5..5eda7a0d0575 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -644,6 +644,10 @@ static const struct hid_device_id apple_devices[] = {
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021),
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021),
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
{ }
};
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 8c70a731ef46..16fbcdab2ae2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -176,6 +176,7 @@
#define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a
+#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f
#define USB_VENDOR_ID_ASUS 0x0486
#define USB_DEVICE_ID_ASUS_T91MT 0x0185
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad
2021-12-02 6:16 ` [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad Alex Henrie
@ 2022-01-02 17:20 ` José Expósito
2022-01-06 12:57 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: José Expósito @ 2022-01-02 17:20 UTC (permalink / raw)
To: alexhenrie24; +Cc: bberg, benjamin, jikos, jose.exposito89, linux-input
Hi!
Thanks a lot for the patches Alex.
I tested them on the following hardware:
- Magic Keyboard 2021 without fingerprint reader. ANSI, ISO and JIS.
- Magic Keyboard 2021 with fingerprint reader. ANSI.
- Magic Keyboard 2021 with fingerprint reader and numpad. ANSI
Code looks good as well.
Tested-by: José Expósito <jose.exposito89@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad
2022-01-02 17:20 ` José Expósito
@ 2022-01-06 12:57 ` Jiri Kosina
0 siblings, 0 replies; 4+ messages in thread
From: Jiri Kosina @ 2022-01-06 12:57 UTC (permalink / raw)
To: José Expósito; +Cc: alexhenrie24, bberg, benjamin, linux-input
On Sun, 2 Jan 2022, José Expósito wrote:
> Hi!
>
> Thanks a lot for the patches Alex.
>
> I tested them on the following hardware:
>
> - Magic Keyboard 2021 without fingerprint reader. ANSI, ISO and JIS.
> - Magic Keyboard 2021 with fingerprint reader. ANSI.
> - Magic Keyboard 2021 with fingerprint reader and numpad. ANSI
>
> Code looks good as well.
>
> Tested-by: José Expósito <jose.exposito89@gmail.com>
Applied, thanks.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-06 12:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02 6:16 [PATCH 1/2] HID: apple: Add 2021 Magic Keyboard with fingerprint reader Alex Henrie
2021-12-02 6:16 ` [PATCH 2/2] HID: apple: Add 2021 Magic Keyboard with number pad Alex Henrie
2022-01-02 17:20 ` José Expósito
2022-01-06 12:57 ` Jiri Kosina
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).