Commit a71338bb authored by Aditya Garg's avatar Aditya Garg Committed by Jiri Kosina
Browse files

HID: apple: Add necessary IDs and support for replacement trackpad on MacBookPro15,1 



Some third party trackpad replacements like that of HAWSON may have a
different PID than the stock trackpad. This commit adds one such trackpad
to hid-apple, available for MacBookPro15,1

Signed-off-by: default avatarAditya Garg <gargaditya08@live.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent c5f3a743

drivers/hid/hid-apple.c

+4 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132:

		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213:

		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680:

		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680_ALT:

			table = macbookpro_no_esc_fn_keys;

			break;

		case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F:
@@ -1159,6 +1160,9 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680),

		.driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK |

			APPLE_DISABLE_FKEYS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680_ALT),

		.driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK |

			APPLE_DISABLE_FKEYS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213),

		.driver_data = APPLE_HAS_FN | APPLE_BACKLIGHT_CTL | APPLE_ISO_TILDE_QUIRK |

			APPLE_DISABLE_FKEYS },

drivers/hid/hid-ids.h

+9 −8
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K		0x027a

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132		0x027b

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680		0x027c

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680_ALT	0x0278

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213		0x027d

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K		0x027e

#define USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223		0x027f

drivers/hid/hid-quirks.c

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680_ALT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223) },