History

Input: bcm5974 - Add support for 2012 MacBook Pro Retina

Add support for the 15'' MacBook Pro Retina model (MacBookPro10,1). Patch originally written by clipcarl (forums.opensuse.org).

Henrik Rydberg committed 14 years ago

Commit 3dde22a1 parent b2e6ad71 file · +20 −0Browse files

Unified · Split

drivers/input/mouse/bcm5974.c+20−0
@@ -79,6 +79,10 @@ · 78 unmodified lines
7979 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252
8080 #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253
8181 #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
8286
8387 #define BCM5974_DEVICE(prod) { \
8488 .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
@@ -128,6 +132,10 @@ static const struct usb_device_id bcm5974_table[] = { · 43 unmodified lines
128132 BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
129133 BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
130134 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),
131139 /* Terminating entry */
132140 {}
133141 };
@@ -354,6 +362,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { · 220 unmodified lines
354362 { DIM_X, DIM_X / SN_COORD, -4620, 5140 },
355363 { DIM_Y, DIM_Y / SN_COORD, -150, 6600 }
356364 },
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+ },
357377 {}
358378 };
359379

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t