View | Details | Raw Unified | Return to bug 96771 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/input/mouse/bcm5974.c (-1 / +21 lines)
Lines 91-96 Link Here
91
#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290
91
#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290
92
#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291
92
#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291
93
#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
93
#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
94
/* MacbookPro12,1 (2015) */
95
#define USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI	0x0252
96
#define USB_DEVICE_ID_APPLE_WELLSPRING9_ISO		0x0253
97
#define USB_DEVICE_ID_APPLE_WELLSPRING9_JIS		0x0254
94
98
95
#define BCM5974_DEVICE(prod) {					\
99
#define BCM5974_DEVICE(prod) {					\
96
	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
100
	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
Lines 152-157 static const struct usb_device_id bcm5974_table[] = { Link Here
152
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI),
156
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI),
153
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ISO),
157
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ISO),
154
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_JIS),
158
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_JIS),
159
	/* MacbookPro12,1 */
160
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI),
161
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_ISO),
162
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
155
	/* Terminating entry */
163
	/* Terminating entry */
156
	{}
164
	{}
157
};
165
};
Lines 423-428 static const struct bcm5974_config bcm5974_config_table[] = { Link Here
423
		{ SN_COORD, -150, 6600 },
431
		{ SN_COORD, -150, 6600 },
424
		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
432
		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
425
	},
433
	},
434
	{
435
		USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI,
436
		USB_DEVICE_ID_APPLE_WELLSPRING9_ISO,
437
		USB_DEVICE_ID_APPLE_WELLSPRING9_JIS,
438
		HAS_INTEGRATED_BUTTON,
439
		0, sizeof(struct bt_data),
440
		0x83, TYPE3, FINGER_TYPE3, FINGER_TYPE3 + SIZEOF_ALL_FINGERS,
441
		{ SN_PRESSURE, 0, 300 },
442
		{ SN_WIDTH, 0, 2048 },
443
		{ SN_COORD, -4620, 5140 },
444
		{ SN_COORD, -150, 6600 },
445
		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
446
	},
426
	{}
447
	{}
427
};
448
};
428
449
429
- 

Return to bug 96771