Commit b2e6ad7d authored by Ryan Bourgeois's avatar Ryan Bourgeois Committed by Dmitry Torokhov
Browse files

HID: add support for 2012 MacBook Pro Retina 



Add support for the 15'' MacBook Pro Retina. The keyboard is
the same as recent models.

The patch needs to be synchronized with the bcm5974 patch for
the trackpad - as usual.

Patch originally written by clipcarl (forums.opensuse.org).

[rydberg@euromail.se: Amended mouse ignore lines]
Signed-off-by: default avatarRyan Bourgeois <bluedragonx@gmail.com>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9b7e31bb

drivers/hid/hid-apple.c

+6 −0
Original line number Diff line number Diff line
@@ -514,6 +514,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-core.c

+6 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
@@ -2008,6 +2011,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) },

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

	{ }

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d

#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI	0x0262

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO	0x0263

#define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS	0x0264

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b