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

Commit fef3f571 authored by Ryan Finnie's avatar Ryan Finnie Committed by Jiri Kosina
Browse files

HID: Support Apple mini aluminum keyboard 



New USB device ids and quirks for the "mini" Apple USB aluminum
keyboards released Tuesday, model A1242.  Note that while I own the ANSI
(0x021d) version and cannot verify that the ISO (0x021e) and JIS
(0x021f) versions exist, previous releases have followed the triple id
convention for awhile now, and the device ids fit perfectly between
USB_DEVICE_ID_APPLE_GEYSER4_* and USB_DEVICE_ID_APPLE_ALU_*.

Signed-off-by: default avatarRyan Finnie <ryan@finnie.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fdf93aa3

drivers/hid/hid-apple.c

+6 −0
Original line number Diff line number Diff line
@@ -387,6 +387,12 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1236,6 +1236,9 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) },

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI	0x021a

#define USB_DEVICE_ID_APPLE_GEYSER4_ISO	0x021b

#define USB_DEVICE_ID_APPLE_GEYSER4_JIS	0x021c

#define USB_DEVICE_ID_APPLE_ALU_MINI_ANSI	0x021d

#define USB_DEVICE_ID_APPLE_ALU_MINI_ISO	0x021e

#define USB_DEVICE_ID_APPLE_ALU_MINI_JIS	0x021f

#define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220

#define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221

#define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222