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

Commit afd21ee5 authored by Julien BLACHE's avatar Julien BLACHE Committed by Greg Kroah-Hartman
Browse files

USB: hid-core: canonical defines for Apple USB device IDs 



Use canonical defines for the Apple USB device IDs.
Also add the Geyser IV devices missing in my previous patch.

Signed-off-by: default avatarJulien BLACHE <jb@jblache.org>
Acked-by: default avatarDmitry Torokhov <dtor@insightbb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54ecf1fb

drivers/usb/input/hid-core.c

+26 −11
Original line number Diff line number Diff line
@@ -1640,6 +1640,19 @@ void hid_init_reports(struct hid_device *hid) 


#define USB_VENDOR_ID_APPLE		0x05ac

#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304

#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI	0x020e

#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO	0x020f

#define USB_DEVICE_ID_APPLE_GEYSER_ANSI	0x0214

#define USB_DEVICE_ID_APPLE_GEYSER_ISO	0x0215

#define USB_DEVICE_ID_APPLE_GEYSER_JIS	0x0216

#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI	0x0217

#define USB_DEVICE_ID_APPLE_GEYSER3_ISO	0x0218

#define USB_DEVICE_ID_APPLE_GEYSER3_JIS	0x0219

#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_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b



#define USB_VENDOR_ID_CHERRY		0x046a

#define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023
@@ -1807,17 +1820,19 @@ static const struct hid_blacklist { 


	{ USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_CYMOTION },



	{ USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x021B, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },



	{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },