diff options
Diffstat (limited to 'drivers/input')
-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 3126983c004a..48d9ec13d32d 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
@@ -67,6 +67,10 @@ | |||
67 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 | 67 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 |
68 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 | 68 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 |
69 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 | 69 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 |
70 | /* MacbookAir4,2 (unibody, July 2011) */ | ||
71 | #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI 0x024c | ||
72 | #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO 0x024d | ||
73 | #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS 0x024e | ||
70 | 74 | ||
71 | #define BCM5974_DEVICE(prod) { \ | 75 | #define BCM5974_DEVICE(prod) { \ |
72 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 76 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
@@ -104,6 +108,10 @@ static const struct usb_device_id bcm5974_table[] = { | |||
104 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI), | 108 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI), |
105 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO), | 109 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO), |
106 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), | 110 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), |
111 | /* MacbookAir4,2 */ | ||
112 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI), | ||
113 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_ISO), | ||
114 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING6_JIS), | ||
107 | /* Terminating entry */ | 115 | /* Terminating entry */ |
108 | {} | 116 | {} |
109 | }; | 117 | }; |
@@ -294,6 +302,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
294 | { DIM_X, DIM_X / SN_COORD, -4415, 5050 }, | 302 | { DIM_X, DIM_X / SN_COORD, -4415, 5050 }, |
295 | { DIM_Y, DIM_Y / SN_COORD, -55, 6680 } | 303 | { DIM_Y, DIM_Y / SN_COORD, -55, 6680 } |
296 | }, | 304 | }, |
305 | { | ||
306 | USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI, | ||
307 | USB_DEVICE_ID_APPLE_WELLSPRING6_ISO, | ||
308 | USB_DEVICE_ID_APPLE_WELLSPRING6_JIS, | ||
309 | HAS_INTEGRATED_BUTTON, | ||
310 | 0x84, sizeof(struct bt_data), | ||
311 | 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | ||
312 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, | ||
313 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
314 | { DIM_X, DIM_X / SN_COORD, -4620, 5140 }, | ||
315 | { DIM_Y, DIM_Y / SN_COORD, -150, 6600 } | ||
316 | }, | ||
297 | {} | 317 | {} |
298 | }; | 318 | }; |
299 | 319 | ||