diff mbox series

[1/2] HID: hid-apple: Apple Magic Keyboard a3203 USB-C support (backporting)

Message ID 20250306070027.532052-1-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 
From: Ievgen Vovk <YevgenVovk@ukr.net>

Backporting of Ievgen Vovk's commit 2813e00dcd748cef47d2bffaa04071de93fddf00
From 6.14-rc5 to 6.13

Signed-off-by Grigorii Sokolik <g.sokol99@g-sokol.info>
---
[PATCH] HID: hid-apple: Apple Magic Keyboard a3203 USB-C support
Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0320)
to those recognized by the hid-apple driver. Keyboard is otherwise
compatible with the existing implementation for its earlier 2021 model.

Signed-off-by: Ievgen Vovk <YevgenVovk@ukr.net>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
---
 drivers/hid/hid-apple.c | 5 +++++
 drivers/hid/hid-ids.h   | 1 +
 2 files changed, 6 insertions(+)

Comments

Aditya Garg March 6, 2025, 6:51 p.m. UTC | #1 
> On 6 Mar 2025, at 12:30 PM, Grigorii Sokolik <g.sokol99@g-sokol.info> wrote:
> 
> From: Ievgen Vovk <YevgenVovk@ukr.net>
> 
> Backporting of Ievgen Vovk's commit 2813e00dcd748cef47d2bffaa04071de93fddf00
> From 6.14-rc5 to 6.13

In order to back port, you need to Cc stable@vger.kernel.org.

Anyways, this patch isn’t eligible for backporting IMO

Please read: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.14-rc5
> 
> 
> 
> Signed-off-by Grigorii Sokolik <g.sokol99@g-sokol.info>
> ---
> [PATCH] HID: hid-apple: Apple Magic Keyboard a3203 USB-C support
> Add Apple Magic Keyboard 2024 model (with USB-C port) device ID (0320)
> to those recognized by the hid-apple driver. Keyboard is otherwise
> compatible with the existing implementation for its earlier 2021 model.
> 
> Signed-off-by: Ievgen Vovk <YevgenVovk@ukr.net>
> Signed-off-by: Jiri Kosina <jkosina@suse.com>
> ---
> drivers/hid/hid-apple.c | 5 +++++
> drivers/hid/hid-ids.h   | 1 +
> 2 files changed, 6 insertions(+)
>
diff mbox series

Patch

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 7e1ae2a2bc..3c3f67d0bf 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -474,6 +474,7 @@  static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
 			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015)
 			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_FINGERPRINT_2021 ||
 			 hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021)
 			table = apple2021_fn_keys;
@@ -1150,6 +1151,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_2021),
 		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_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_2024),
+		.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 1f47fda809..4f583d6f2e 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -184,6 +184,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_2024   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