diff options
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index f9e2758b9f46..e410b98c2271 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
| @@ -79,6 +79,10 @@ | |||
| 79 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 | 79 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 |
| 80 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 | 80 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 |
| 81 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 | 81 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 |
| 82 | /* MacbookPro10,1 (unibody, June 2012) */ | ||
| 83 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 | ||
| 84 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 | ||
| 85 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 | ||
| 82 | 86 | ||
| 83 | #define BCM5974_DEVICE(prod) { \ | 87 | #define BCM5974_DEVICE(prod) { \ |
| 84 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 88 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
| @@ -128,6 +132,10 @@ static const struct usb_device_id bcm5974_table[] = { | |||
| 128 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), | 132 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI), |
| 129 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), | 133 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO), |
| 130 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), | 134 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS), |
| 135 | /* MacbookPro10,1 */ | ||
| 136 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), | ||
| 137 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), | ||
| 138 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), | ||
| 131 | /* Terminating entry */ | 139 | /* Terminating entry */ |
| 132 | {} | 140 | {} |
| 133 | }; | 141 | }; |
| @@ -354,6 +362,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
| 354 | { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, | 362 | { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, |
| 355 | { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } | 363 | { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } |
| 356 | }, | 364 | }, |
| 365 | { | ||
| 366 | USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI, | ||
| 367 | USB_DEVICE_ID_APPLE_WELLSPRING7_ISO, | ||
| 368 | USB_DEVICE_ID_APPLE_WELLSPRING7_JIS, | ||
| 369 | HAS_INTEGRATED_BUTTON, | ||
| 370 | 0x84, sizeof(struct bt_data), | ||
| 371 | 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | ||
| 372 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, | ||
| 373 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
| 374 | { DIM_X, DIM_X / SN_COORD, -4750, 5280 }, | ||
| 375 | { DIM_Y, DIM_Y / SN_COORD, -150, 6730 } | ||
| 376 | }, | ||
| 357 | {} | 377 | {} |
| 358 | }; | 378 | }; |
| 359 | 379 | ||
