Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
HID: support for new unibody macbooks
The unibody MacBook 5 and MacBook Pro 5 come with a new version of
the bcm5974 trackpad. This patch adds the USB device ids and all
the appropriate quirks, including hid_blacklist.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
authored by Henrik Rydberg and committed by Jiri Kosina a96d6ef3 7d672cd7
+6
drivers/hid/hid-apple.c
+6
drivers/hid/hid-apple.c
···
418
418
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
419
419
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
420
420
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
421
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
422
+
.driver_data = APPLE_HAS_FN },
423
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
424
+
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
425
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
426
+
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
421
427
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
422
428
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
423
429
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
+6
drivers/hid/hid-core.c
+6
drivers/hid/hid-core.c
···
1250
1250
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
1251
1251
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
1252
1252
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
1253
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
1254
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
1255
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
1253
1256
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
1254
1257
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
1255
1258
{ HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
···
1576
1573
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
1577
1574
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
1578
1575
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
1576
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
1577
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
1578
+
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
1579
1579
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
1580
1580
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
1581
1581
{ }
+3
drivers/hid/hid-ids.h
+3
drivers/hid/hid-ids.h
···
82
82
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230
83
83
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231
84
84
#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
85
+
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
86
+
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
87
+
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
85
88
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
86
89
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
87
90
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241