Commit 4604baaf authored by Aditya Garg's avatar Aditya Garg Committed by Jiri Kosina
Browse files

HID: apple: Add Apple Magic Keyboard A3119 USB-C support 



Add Apple Magic Keyboard 2024 with Touch ID and Numeric Keypad device ID
(05ac:0322) 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 avatarAditya Garg <gargaditya08@live.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent e77bdf51

drivers/hid/hid-apple.c

+5 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021:

		case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024:

		case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024:

		case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024:

			table = magic_keyboard_2021_and_2024_fn_keys;

			break;

		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132:
@@ -1182,6 +1183,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_2024),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_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_NUMPAD_2024),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT),

		.driver_data = APPLE_MAGIC_BACKLIGHT },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021   0x029f

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024   0x0320

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2024   0x0321

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2024   0x0322

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292