Commit 0cd3be51 authored by Alex Henrie's avatar Alex Henrie Committed by Jiri Kosina
Browse files

HID: apple: Add support for the 2021 Magic Keyboard 



Signed-off-by: default avatarAlex Henrie <alexhenrie24@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 371a9dce

drivers/hid/hid-apple.c

+4 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),

		.driver_data = APPLE_HAS_FN },



	{ }

};

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define USB_DEVICE_ID_APPLE_IRCONTROL3	0x8241

#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_VENDOR_ID_ASUS		0x0486

#define USB_DEVICE_ID_ASUS_T91MT	0x0185

drivers/hid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015) },

	{ 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) },

#endif

#if IS_ENABLED(CONFIG_HID_APPLEIR)

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },