Commit 2813e00d authored by Ievgen Vovk's avatar Ievgen Vovk Committed by Jiri Kosina
Browse files

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: default avatarIevgen Vovk <YevgenVovk@ukr.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 8b125949

drivers/hid/hid-apple.c

+5 −0
Original line number Diff line number Diff line
@@ -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),

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -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