Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d94275 authored by Jean-Gabriel Gill-Couture's avatar Jean-Gabriel Gill-Couture Committed by Jiri Kosina
Browse files

HID: add usb device id for Apple Magic Keyboard 



USB device
	Vendor 05ac (Apple)
	Device 0267 (Magic Keyboard)

This keyboard supports both Bluetooth and USB connections, this patch
only covers USB.

Thanks to Maxime Poulin <maxpoulin64@gmail.com>

Signed-off-by: default avatarJean-Gabriel Gill-Couture <jeangab@jeangab.fr.nf>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 595d9e34

drivers/hid/hid-apple.c

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

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),

drivers/hid/hid-core.c

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

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },

	{ 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_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292