diff mbox series

[2/2] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support

Message ID 20250306070027.532052-2-g.sokol99@g-sokol.info (mailing list archive)
State New
Delegated to: Jiri Kosina
Headers show
Series [1/2] HID: hid-apple: Apple Magic Keyboard a3203 USB-C support (backporting) | expand

Commit Message

Grigorii Sokolik March 6, 2025, 7 a.m. UTC
Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0321)
to those recognized by the hid-apple driver. Keyboard is otherwise
compatible with the existing implementation for its earlier 2021 model.

Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
---
 drivers/hid/hid-apple.c | 5 +++++
 drivers/hid/hid-ids.h   | 1 +
 2 files changed, 6 insertions(+)

Comments

Aditya Garg March 6, 2025, 6:54 p.m. UTC | #1
> On 6 Mar 2025, at 12:30 PM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
> 
> Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0321)
> to those recognized by the hid-apple driver. Keyboard is otherwise
> compatible with the existing implementation for its earlier 2021 model.
> 
> Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
> ---
> drivers/hid/hid-apple.c | 5 +++++
> drivers/hid/hid-ids.h   | 1 +
> 2 files changed, 6 insertions(+)
> 
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -185,6 +185,7 @@
> #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
> +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2   0x0320

It’s the same ID as USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024, why are you adding this again? Typo?

Also, please use switch case, you can submit your patch as a part of:

https://lore.kernel.org/linux-input/A50C1CF0-B927-4FCF-828F-1F5F79BA3762@live.com/

Just resubmit those 2 patches along with your patch and make a v2.

> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021   0x029a
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f
> #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
> -- 
> 2.48.1
> 
>
Aditya Garg March 6, 2025, 7:05 p.m. UTC | #2
> On 7 Mar 2025, at 12:24 AM, Aditya Garg <gargaditya08@live.com> wrote:
> 
> 
> 
>> On 6 Mar 2025, at 12:30 PM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
>> 
>> Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0321)
>> to those recognized by the hid-apple driver. Keyboard is otherwise
>> compatible with the existing implementation for its earlier 2021 model.
>> 
>> Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
>> ---
>> drivers/hid/hid-apple.c | 5 +++++
>> drivers/hid/hid-ids.h   | 1 +
>> 2 files changed, 6 insertions(+)
>> 
>> --- a/drivers/hid/hid-ids.h
>> +++ b/drivers/hid/hid-ids.h
>> @@ -185,6 +185,7 @@
>> #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
>> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
>> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
>> +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2   0x0320

A3118 is the one with Touch ID. Name should be USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024 to be more clear.
> 
> It’s the same ID as USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024, why are you adding this again? Typo?
> 
> Also, please use switch case, you can submit your patch as a part of:
> 
> https://lore.kernel.org/linux-input/A50C1CF0-B927-4FCF-828F-1F5F79BA3762@live.com/
> 
> Just resubmit those 2 patches along with your patch and make a v2.
Grigorii Sokolik March 6, 2025, 8:31 p.m. UTC | #3
Thank you so much. Here is the fix:

---
[PATCH] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support

Add Apple Magic Keyboard with fingerprint 2024 model (with USB-C port)
device ID (0321) to those recognized by the hid-apple driver. Keyboard
is otherwise compatible with the existing implementation for its
earlier 2021 model.

Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
---
 drivers/hid/hid-apple.c | 5 +++++
 drivers/hid/hid-ids.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index d900dd05c..ecdfbda66 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -482,6 +482,7 @@ static int hidinput_apple_event(struct hid_device
*hid, struct input_dev *input,
  else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 ||
  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 ||
  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 ||
+ hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024 ||
  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
  table = apple2021_fn_keys;
  else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 ||
@@ -1165,6 +1166,10 @@ static const struct hid_device_id apple_devices[] = {
  .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
  { 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_FINGERPRINT_2024),
+ .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024),
+ .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 | APPLE_RDESC_BATTERY },
  { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021),
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7e4006249..d59c28495 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -186,6 +186,7 @@
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021   0x029a
+#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024   0x0321
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f
 #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
 #define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302
Aditya Garg March 7, 2025, 10:08 a.m. UTC | #4
> On 7 Mar 2025, at 2:02 AM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
> 
> Thank you so much. Here is the fix:
> 
> ---
> [PATCH] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support
> 
> Add Apple Magic Keyboard with fingerprint 2024 model (with USB-C port)
> device ID (0321) to those recognized by the hid-apple driver. Keyboard
> is otherwise compatible with the existing implementation for its
> earlier 2021 model.
> 
> Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
> ---
> drivers/hid/hid-apple.c | 5 +++++
> drivers/hid/hid-ids.h   | 1 +
> 2 files changed, 6 insertions(+)
> 
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index d900dd05c..ecdfbda66 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -482,6 +482,7 @@ static int hidinput_apple_event(struct hid_device
> *hid, struct input_dev *input,
>  else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 ||
>  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 ||
>  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 ||
> + hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024 ||

Nit: can we keep all the 2021 and 2024 keyboards seperate? As in the 3 variants of 2021 first then 2024?
>  hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
>  table = apple2021_fn_keys;

I think renaming apple2021_fn_keys to magic_keyboard_2021_and_2024_fn_keys would make more sense.

>  else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 ||
> @@ -1165,6 +1166,10 @@ static const struct hid_device_id apple_devices[] = {
>  .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
>  { 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_FINGERPRINT_2024),

Again, regroup 2021 and 2024 separately.
> + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
> + { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024),
> + .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 | APPLE_RDESC_BATTERY },
>  { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021),
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 7e4006249..d59c28495 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -186,6 +186,7 @@
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021   0x029a
> +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024   0x0321

Again, regroup 2021 and 2024 separately.
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f
> #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
> #define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302
> --
> 2.48.1
> 
> ---
> drivers/hid/hid-apple.c | 5 +++++
> drivers/hid/hid-ids.h   | 1 +
> 2 files changed, 6 insertions(+)
> 
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index 3c3f67d0bf..daf4c505e7 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -475,6 +475,7 @@ static int hidinput_apple_event(struct hid_device
> *hid, struct input_dev *input,
>                        table = magic_keyboard_2015_fn_keys;
>                else if (hid->product ==
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 ||
>                         hid->product ==
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 ||
> +                        hid->product ==
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2 ||
>                         hid->product ==

Why are you sending this again?
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 ||
>                         hid->product ==
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
>                        table = apple2021_fn_keys;
> @@ -1155,6 +1156,10 @@ static const struct hid_device_id apple_devices[] = {
>                .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK |
> APPLE_RDESC_BATTERY },
>        { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024),
>                .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
> +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2),
> +               .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK |
> APPLE_RDESC_BATTERY },
> +       { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2),
> +               .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 |
> APPLE_RDESC_BATTERY },
>        { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 4f583d6f2e..953850f043 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -185,6 +185,7 @@
> #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
> +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2   0x0320
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021   0x029a
> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f
> #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102
> --
> 2.48.1
>> On Thu, Mar 6, 2025 at 9:05 PM Aditya Garg <gargaditya08@live.com> wrote:
>> 
>> 
>> 
>>>> On 7 Mar 2025, at 12:24 AM, Aditya Garg <gargaditya08@live.com> wrote:
>>> 
>>> 
>>> 
>>>> On 6 Mar 2025, at 12:30 PM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
>>>> 
>>>> Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0321)
>>>> to those recognized by the hid-apple driver. Keyboard is otherwise
>>>> compatible with the existing implementation for its earlier 2021 model.
>>>> 
>>>> Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
>>>> ---
>>>> drivers/hid/hid-apple.c | 5 +++++
>>>> drivers/hid/hid-ids.h   | 1 +
>>>> 2 files changed, 6 insertions(+)
>>>> 
>>>> --- a/drivers/hid/hid-ids.h
>>>> +++ b/drivers/hid/hid-ids.h
>>>> @@ -185,6 +185,7 @@
>>>> #define USB_DEVICE_ID_APPLE_IRCONTROL5 0x8243
>>>> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
>>>> #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
>>>> +#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2   0x0320
>> 
>> A3118 is the one with Touch ID. Name should be USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024 to be more clear.
>>> 
>>> It’s the same ID as USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024, why are you adding this again? Typo?
>>> 
>>> Also, please use switch case, you can submit your patch as a part of:
>>> 
>>> https://lore.kernel.org/linux-input/A50C1CF0-B927-4FCF-828F-1F5F79BA3762@live.com/
>>> 
>>> Just resubmit those 2 patches along with your patch and make a v2.
>> 
> 
> 
> --
> 
> Thanks!
> Kind regards,
> Grigorii!
Aditya Garg March 7, 2025, 12:06 p.m. UTC | #5
> On 7 Mar 2025, at 2:01 AM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
> 
> Thank you so much. Here is the fix:
> 
> ---
> [PATCH] HID: hid-apple: Apple Magic Keyboard a3118 USB-C support
> 
> Add Apple Magic Keyboard with fingerprint 2024 model (with USB-C port)
> device ID (0321) to those recognized by the hid-apple driver. Keyboard
> is otherwise compatible with the existing implementation for its
> earlier 2021 model.
> 
> Signed-off-by: Grigorii Sokolik <g.sokol99@g-sokol.info>
> ---
> drivers/hid/hid-apple.c | 5 +++++
> drivers/hid/hid-ids.h   | 1 +
> 2 files changed, 6 insertions(+)


In case you send a revision, please send it as a separate patch with v2 added in subject.
Also, this patch you sent as a reply was corrupt.

You also didn’t reply to the maintainers.

I’ve sent your patch as a part of my patch series over here:

https://lore.kernel.org/linux-input/A4FBEA54-C7BA-4864-9C4E-E41933D81FB0@live.com/T/#t
diff mbox series

Patch

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 3c3f67d0bf..daf4c505e7 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -475,6 +475,7 @@  static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
 			table = magic_keyboard_2015_fn_keys;
 		else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 ||
 			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 ||
+			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2 ||
 			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 ||
 			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
 			table = apple2021_fn_keys;
@@ -1155,6 +1156,10 @@  static const struct hid_device_id apple_devices[] = {
 		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
 	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024),
 		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2),
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY },
+	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2),
+		.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 | APPLE_RDESC_BATTERY },
 	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4f583d6f2e..953850f043 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -185,6 +185,7 @@ 
 #define USB_DEVICE_ID_APPLE_IRCONTROL5	0x8243
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320
+#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024_V2   0x0320
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021   0x029a
 #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f
 #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102