Commit 371a9dce authored by Alex Henrie's avatar Alex Henrie Committed by Jiri Kosina
Browse files

HID: apple: Rename MAGIC_KEYBOARD_ANSI to MAGIC_KEYBOARD_2015 



The ANSI, ISO, and JIS variants of this keyboard all have the same
product ID.

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

drivers/hid/hid-apple.c

+4 −4
Original line number Diff line number Diff line
@@ -531,13 +531,13 @@ 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),

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN },

drivers/hid/hid-ids.h

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ 
#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_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015   0x0267

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015   0x026c

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292

drivers/hid/hid-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,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_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) },

#endif