diff options
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 3a78f235fa3e..2baff1b79a55 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
| @@ -84,6 +84,10 @@ | |||
| 84 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 | 84 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 |
| 85 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 | 85 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 |
| 86 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 | 86 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 |
| 87 | /* MacbookPro10,2 (unibody, October 2012) */ | ||
| 88 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259 | ||
| 89 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a | ||
| 90 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b | ||
| 87 | 91 | ||
| 88 | #define BCM5974_DEVICE(prod) { \ | 92 | #define BCM5974_DEVICE(prod) { \ |
| 89 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 93 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
| @@ -137,6 +141,10 @@ static const struct usb_device_id bcm5974_table[] = { | |||
| 137 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), | 141 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), |
| 138 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), | 142 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), |
| 139 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), | 143 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), |
| 144 | /* MacbookPro10,2 */ | ||
| 145 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI), | ||
| 146 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO), | ||
| 147 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), | ||
| 140 | /* Terminating entry */ | 148 | /* Terminating entry */ |
| 141 | {} | 149 | {} |
| 142 | }; | 150 | }; |
| @@ -379,6 +387,19 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
| 379 | { SN_COORD, -150, 6730 }, | 387 | { SN_COORD, -150, 6730 }, |
| 380 | { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } | 388 | { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } |
| 381 | }, | 389 | }, |
| 390 | { | ||
| 391 | USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI, | ||
| 392 | USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO, | ||
| 393 | USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS, | ||
| 394 | HAS_INTEGRATED_BUTTON, | ||
| 395 | 0x84, sizeof(struct bt_data), | ||
| 396 | 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | ||
| 397 | { SN_PRESSURE, 0, 300 }, | ||
| 398 | { SN_WIDTH, 0, 2048 }, | ||
| 399 | { SN_COORD, -4750, 5280 }, | ||
| 400 | { SN_COORD, -150, 6730 }, | ||
| 401 | { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } | ||
| 402 | }, | ||
| 382 | {} | 403 | {} |
| 383 | }; | 404 | }; |
| 384 | 405 | ||
