b37f23
centosplus patch (bug#10447)
b37f23
support for touchpad and fn key support for MacBookPro 12,1
b37f23
b37f23
https://kernel.googlesource.com/pub/scm/linux/kernel/git/groeck/linux-staging/+/dbe08116b87cdc2217f11a78b5b70e29068b7efd%5E1..dbe08116b87cdc2217f11a78b5b70e29068b7efd/
b37f23
b37f23
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
b37f23
b37f23
Pull input fixes from Dmitry Torokhov:
b37f23
 "The main change is support for keyboards and touchpads found in 2015
b37f23
  editions of Macbooks"
b37f23
b37f23
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
b37f23
  Revert "Input: zforce - don't overwrite the stack"
b37f23
  Input: bcm5974 - add support for the 2015 Macbook Pro
b37f23
  HID: apple: Add support for the 2015 Macbook Pro
b37f23
  Input: bcm5974 - prepare for a new trackpad generation
b37f23
  Input: synaptics - dump ext10 capabilities as well
b37f23
b37f23
Applied-by Akemi Yagi <toracat@centos.org>
b37f23
b37f23
--- a/drivers/hid/hid-apple.c	2016-01-23 00:53:07.000000000 -0800
b37f23
+++ b/drivers/hid/hid-apple.c	2016-03-08 12:41:27.147368677 -0800
b37f23
@@ -552,6 +552,12 @@ static const struct hid_device_id apple_
b37f23
 		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS),
b37f23
 		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI),
b37f23
+		.driver_data = APPLE_HAS_FN },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO),
b37f23
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
b37f23
+		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
b37f23
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
b37f23
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
b37f23
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
b37f23
--- a/drivers/hid/hid-core.c	2016-01-23 00:53:07.000000000 -0800
b37f23
+++ b/drivers/hid/hid-core.c	2016-03-08 12:45:44.846880469 -0800
b37f23
@@ -1643,6 +1643,9 @@ static const struct hid_device_id hid_ha
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) },
b37f23
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
b37f23
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
b37f23
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
b37f23
@@ -2284,6 +2287,9 @@ static const struct hid_device_id hid_mo
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) },
b37f23
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
b37f23
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
b37f23
 	{ }
b37f23
--- a/drivers/hid/hid-ids.h	2016-01-23 00:53:07.000000000 -0800
b37f23
+++ b/drivers/hid/hid-ids.h	2016-03-08 12:48:25.532198900 -0800
b37f23
@@ -138,6 +138,9 @@
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI	0x0272
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_ISO		0x0273
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_JIS		0x0274
b37f23
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
b37f23
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
b37f23
 #define USB_DEVICE_ID_APPLE_IRCONTROL	0x8240
b37f23
--- a/drivers/input/mouse/bcm5974.c	2016-01-23 00:53:07.000000000 -0800
b37f23
+++ b/drivers/input/mouse/bcm5974.c	2016-03-08 13:37:14.906154047 -0800
b37f23
@@ -2,6 +2,7 @@
b37f23
  * Apple USB BCM5974 (Macbook Air and Penryn Macbook Pro) multitouch driver
b37f23
  *
b37f23
  * Copyright (C) 2008	   Henrik Rydberg (rydberg@euromail.se)
b37f23
+ * Copyright (C) 2015      John Horan (knasher@gmail.com)
b37f23
  *
b37f23
  * The USB initialization and package decoding was made by
b37f23
  * Scott Shawcroft as part of the touchd user-space driver project:
b37f23
@@ -92,6 +93,10 @@
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291
b37f23
 #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
b37f23
+/* MacbookPro12,1 (2015) */
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI	0x0272
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_ISO	0x0273
b37f23
+#define USB_DEVICE_ID_APPLE_WELLSPRING9_JIS	0x0274
b37f23
 
b37f23
 #define BCM5974_DEVICE(prod) {					\
b37f23
 	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
b37f23
@@ -153,6 +158,10 @@ static const struct usb_device_id bcm597
b37f23
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI),
b37f23
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_ISO),
b37f23
 	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING8_JIS),
b37f23
+	/* MacbookPro12,1 */
b37f23
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI),
b37f23
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_ISO),
b37f23
+	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
b37f23
 	/* Terminating entry */
b37f23
 	{}
b37f23
 };
b37f23
@@ -181,21 +190,47 @@ struct bt_data {
b37f23
 enum tp_type {
b37f23
 	TYPE1,			/* plain trackpad */
b37f23
 	TYPE2,			/* button integrated in trackpad */
b37f23
-	TYPE3			/* additional header fields since June 2013 */
b37f23
+	TYPE3,			/* additional header fields since June 2013 */
b37f23
+	TYPE4			/* additional header field for pressure data */
b37f23
 };
b37f23
 
b37f23
 /* trackpad finger data offsets, le16-aligned */
b37f23
-#define FINGER_TYPE1		(13 * sizeof(__le16))
b37f23
-#define FINGER_TYPE2		(15 * sizeof(__le16))
b37f23
-#define FINGER_TYPE3		(19 * sizeof(__le16))
b37f23
+#define HEADER_TYPE1		(13 * sizeof(__le16))
b37f23
+#define HEADER_TYPE2		(15 * sizeof(__le16))
b37f23
+#define HEADER_TYPE3		(19 * sizeof(__le16))
b37f23
+#define HEADER_TYPE4		(23 * sizeof(__le16))
b37f23
 
b37f23
 /* trackpad button data offsets */
b37f23
+#define BUTTON_TYPE1		0
b37f23
 #define BUTTON_TYPE2		15
b37f23
 #define BUTTON_TYPE3		23
b37f23
+#define BUTTON_TYPE4		31
b37f23
 
b37f23
 /* list of device capability bits */
b37f23
 #define HAS_INTEGRATED_BUTTON	1
b37f23
 
b37f23
+/* trackpad finger data block size */
b37f23
+#define FSIZE_TYPE1		(14 * sizeof(__le16))
b37f23
+#define FSIZE_TYPE2		(14 * sizeof(__le16))
b37f23
+#define FSIZE_TYPE3		(14 * sizeof(__le16))
b37f23
+#define FSIZE_TYPE4		(15 * sizeof(__le16))
b37f23
+
b37f23
+/* offset from header to finger struct */
b37f23
+#define DELTA_TYPE1		(0 * sizeof(__le16))
b37f23
+#define DELTA_TYPE2		(0 * sizeof(__le16))
b37f23
+#define DELTA_TYPE3		(0 * sizeof(__le16))
b37f23
+#define DELTA_TYPE4		(1 * sizeof(__le16))
b37f23
+
b37f23
+/* usb control message mode switch data */
b37f23
+#define USBMSG_TYPE1		8, 0x300, 0, 0, 0x1, 0x8
b37f23
+#define USBMSG_TYPE2		8, 0x300, 0, 0, 0x1, 0x8
b37f23
+#define USBMSG_TYPE3		8, 0x300, 0, 0, 0x1, 0x8
b37f23
+#define USBMSG_TYPE4		2, 0x302, 2, 1, 0x1, 0x0
b37f23
+
b37f23
+/* Wellspring initialization constants */
b37f23
+#define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID		1
b37f23
+#define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID	9
b37f23
+
b37f23
 /* trackpad finger structure, le16-aligned */
b37f23
 struct tp_finger {
b37f23
 	__le16 origin;		/* zero when switching track finger */
b37f23
@@ -208,14 +243,13 @@ struct tp_finger {
b37f23
 	__le16 orientation;	/* 16384 when point, else 15 bit angle */
b37f23
 	__le16 touch_major;	/* touch area, major axis */
b37f23
 	__le16 touch_minor;	/* touch area, minor axis */
b37f23
-	__le16 unused[3];	/* zeros */
b37f23
+	__le16 unused[2];	/* zeros */
b37f23
+	__le16 pressure;	/* pressure on forcetouch touchpad */
b37f23
 	__le16 multi;		/* one finger: varies, more fingers: constant */
b37f23
 } __attribute__((packed,aligned(2)));
b37f23
 
b37f23
 /* trackpad finger data size, empirically at least ten fingers */
b37f23
 #define MAX_FINGERS		16
b37f23
-#define SIZEOF_FINGER		sizeof(struct tp_finger)
b37f23
-#define SIZEOF_ALL_FINGERS	(MAX_FINGERS * SIZEOF_FINGER)
b37f23
 #define MAX_FINGER_ORIENTATION	16384
b37f23
 
b37f23
 /* device-specific parameters */
b37f23
@@ -233,8 +267,17 @@ struct bcm5974_config {
b37f23
 	int bt_datalen;		/* data length of the button interface */
b37f23
 	int tp_ep;		/* the endpoint of the trackpad interface */
b37f23
 	enum tp_type tp_type;	/* type of trackpad interface */
b37f23
-	int tp_offset;		/* offset to trackpad finger data */
b37f23
+	int tp_header;		/* bytes in header block */
b37f23
 	int tp_datalen;		/* data length of the trackpad interface */
b37f23
+	int tp_button;		/* offset to button data */
b37f23
+	int tp_fsize;		/* bytes in single finger block */
b37f23
+	int tp_delta;		/* offset from header to finger struct */
b37f23
+	int um_size;		/* usb control message length */
b37f23
+	int um_req_val;		/* usb control message value */
b37f23
+	int um_req_idx;		/* usb control message index */
b37f23
+	int um_switch_idx;	/* usb control message mode switch index */
b37f23
+	int um_switch_on;	/* usb control message mode switch on */
b37f23
+	int um_switch_off;	/* usb control message mode switch off */
b37f23
 	struct bcm5974_param p;	/* finger pressure limits */
b37f23
 	struct bcm5974_param w;	/* finger width limits */
b37f23
 	struct bcm5974_param x;	/* horizontal limits */
b37f23
@@ -260,6 +303,24 @@ struct bcm5974 {
b37f23
 	int slots[MAX_FINGERS];				/* slot assignments */
b37f23
 };
b37f23
 
b37f23
+/* trackpad finger block data, le16-aligned */
b37f23
+static const struct tp_finger *get_tp_finger(const struct bcm5974 *dev, int i)
b37f23
+{
b37f23
+	const struct bcm5974_config *c = &dev->cfg;
b37f23
+	u8 *f_base = dev->tp_data + c->tp_header + c->tp_delta;
b37f23
+
b37f23
+	return (const struct tp_finger *)(f_base + i * c->tp_fsize);
b37f23
+}
b37f23
+
b37f23
+#define DATAFORMAT(type)				\
b37f23
+	type,						\
b37f23
+	HEADER_##type,					\
b37f23
+	HEADER_##type + (MAX_FINGERS) * (FSIZE_##type),	\
b37f23
+	BUTTON_##type,					\
b37f23
+	FSIZE_##type,					\
b37f23
+	DELTA_##type,					\
b37f23
+	USBMSG_##type
b37f23
+
b37f23
 /* logical signal quality */
b37f23
 #define SN_PRESSURE	45		/* pressure signal-to-noise ratio */
b37f23
 #define SN_WIDTH	25		/* width signal-to-noise ratio */
b37f23
@@ -274,7 +335,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING_JIS,
b37f23
 		0,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE1),
b37f23
 		{ SN_PRESSURE, 0, 256 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4824, 5342 },
b37f23
@@ -287,7 +348,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING2_JIS,
b37f23
 		0,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE1, FINGER_TYPE1, FINGER_TYPE1 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE1),
b37f23
 		{ SN_PRESSURE, 0, 256 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4824, 4824 },
b37f23
@@ -300,7 +361,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING3_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4460, 5166 },
b37f23
@@ -313,7 +374,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING4_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4620, 5140 },
b37f23
@@ -326,7 +387,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4616, 5112 },
b37f23
@@ -339,7 +400,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4415, 5050 },
b37f23
@@ -352,7 +413,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING6_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4620, 5140 },
b37f23
@@ -365,7 +426,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4750, 5280 },
b37f23
@@ -378,7 +439,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4620, 5140 },
b37f23
@@ -391,7 +452,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING7_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4750, 5280 },
b37f23
@@ -404,7 +465,7 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0x84, sizeof(struct bt_data),
b37f23
-		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
b37f23
+		0x81, DATAFORMAT(TYPE2),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4750, 5280 },
b37f23
@@ -417,13 +478,26 @@ static const struct bcm5974_config bcm59
b37f23
 		USB_DEVICE_ID_APPLE_WELLSPRING8_JIS,
b37f23
 		HAS_INTEGRATED_BUTTON,
b37f23
 		0, sizeof(struct bt_data),
b37f23
-		0x83, TYPE3, FINGER_TYPE3, FINGER_TYPE3 + SIZEOF_ALL_FINGERS,
b37f23
+		0x83, DATAFORMAT(TYPE3),
b37f23
 		{ SN_PRESSURE, 0, 300 },
b37f23
 		{ SN_WIDTH, 0, 2048 },
b37f23
 		{ SN_COORD, -4620, 5140 },
b37f23
 		{ SN_COORD, -150, 6600 },
b37f23
 		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
b37f23
 	},
b37f23
+	{
b37f23
+		USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI,
b37f23
+		USB_DEVICE_ID_APPLE_WELLSPRING9_ISO,
b37f23
+		USB_DEVICE_ID_APPLE_WELLSPRING9_JIS,
b37f23
+		HAS_INTEGRATED_BUTTON,
b37f23
+		0, sizeof(struct bt_data),
b37f23
+		0x83, DATAFORMAT(TYPE4),
b37f23
+		{ SN_PRESSURE, 0, 300 },
b37f23
+		{ SN_WIDTH, 0, 2048 },
b37f23
+		{ SN_COORD, -4828, 5345 },
b37f23
+		{ SN_COORD, -203, 6803 },
b37f23
+		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
b37f23
+	},
b37f23
 	{}
b37f23
 };
b37f23
 
b37f23
@@ -550,19 +624,18 @@ static int report_tp_state(struct bcm597
b37f23
 	struct input_dev *input = dev->input;
b37f23
 	int raw_n, i, n = 0;
b37f23
 
b37f23
-	if (size < c->tp_offset || (size - c->tp_offset) % SIZEOF_FINGER != 0)
b37f23
+	if (size < c->tp_header || (size - c->tp_header) % c->tp_fsize != 0)
b37f23
 		return -EIO;
b37f23
 
b37f23
-	/* finger data, le16-aligned */
b37f23
-	f = (const struct tp_finger *)(dev->tp_data + c->tp_offset);
b37f23
-	raw_n = (size - c->tp_offset) / SIZEOF_FINGER;
b37f23
+	raw_n = (size - c->tp_header) / c->tp_fsize;
b37f23
 
b37f23
 	for (i = 0; i < raw_n; i++) {
b37f23
-		if (raw2int(f[i].touch_major) == 0)
b37f23
+		f = get_tp_finger(dev, i);
b37f23
+		if (raw2int(f->touch_major) == 0)
b37f23
 			continue;
b37f23
-		dev->pos[n].x = raw2int(f[i].abs_x);
b37f23
-		dev->pos[n].y = c->y.min + c->y.max - raw2int(f[i].abs_y);
b37f23
-		dev->index[n++] = &f[i];
b37f23
+		dev->pos[n].x = raw2int(f->abs_x);
b37f23
+		dev->pos[n].y = c->y.min + c->y.max - raw2int(f->abs_y);
b37f23
+		dev->index[n++] = f;
b37f23
 	}
b37f23
 
b37f23
 	input_mt_assign_slots(input, dev->slots, dev->pos, n);
b37f23
@@ -573,32 +646,22 @@ static int report_tp_state(struct bcm597
b37f23
 
b37f23
 	input_mt_sync_frame(input);
b37f23
 
b37f23
-	report_synaptics_data(input, c, f, raw_n);
b37f23
+	report_synaptics_data(input, c, get_tp_finger(dev, 0), raw_n);
b37f23
 
b37f23
-	/* type 2 reports button events via ibt only */
b37f23
-	if (c->tp_type == TYPE2) {
b37f23
-		int ibt = raw2int(dev->tp_data[BUTTON_TYPE2]);
b37f23
+	/* later types report button events via integrated button only */
b37f23
+	if (c->caps & HAS_INTEGRATED_BUTTON) {
b37f23
+		int ibt = raw2int(dev->tp_data[c->tp_button]);
b37f23
 		input_report_key(input, BTN_LEFT, ibt);
b37f23
 	}
b37f23
 
b37f23
-	if (c->tp_type == TYPE3)
b37f23
-		input_report_key(input, BTN_LEFT, dev->tp_data[BUTTON_TYPE3]);
b37f23
-
b37f23
 	input_sync(input);
b37f23
 
b37f23
 	return 0;
b37f23
 }
b37f23
 
b37f23
-/* Wellspring initialization constants */
b37f23
-#define BCM5974_WELLSPRING_MODE_READ_REQUEST_ID		1
b37f23
-#define BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID	9
b37f23
-#define BCM5974_WELLSPRING_MODE_REQUEST_VALUE		0x300
b37f23
-#define BCM5974_WELLSPRING_MODE_REQUEST_INDEX		0
b37f23
-#define BCM5974_WELLSPRING_MODE_VENDOR_VALUE		0x01
b37f23
-#define BCM5974_WELLSPRING_MODE_NORMAL_VALUE		0x08
b37f23
-
b37f23
 static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
b37f23
 {
b37f23
+	const struct bcm5974_config *c = &dev->cfg;
b37f23
 	int retval = 0, size;
b37f23
 	char *data;
b37f23
 
b37f23
@@ -606,7 +669,7 @@ static int bcm5974_wellspring_mode(struc
b37f23
 	if (dev->cfg.tp_type == TYPE3)
b37f23
 		return 0;
b37f23
 
b37f23
-	data = kmalloc(8, GFP_KERNEL);
b37f23
+	data = kmalloc(c->um_size, GFP_KERNEL);
b37f23
 	if (!data) {
b37f23
 		dev_err(&dev->intf->dev, "out of memory\n");
b37f23
 		retval = -ENOMEM;
b37f23
@@ -617,28 +680,24 @@ static int bcm5974_wellspring_mode(struc
b37f23
 	size = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
b37f23
 			BCM5974_WELLSPRING_MODE_READ_REQUEST_ID,
b37f23
 			USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
b37f23
-			BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
b37f23
-			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
b37f23
+			c->um_req_val, c->um_req_idx, data, c->um_size, 5000);
b37f23
 
b37f23
-	if (size != 8) {
b37f23
+	if (size != c->um_size) {
b37f23
 		dev_err(&dev->intf->dev, "could not read from device\n");
b37f23
 		retval = -EIO;
b37f23
 		goto out;
b37f23
 	}
b37f23
 
b37f23
 	/* apply the mode switch */
b37f23
-	data[0] = on ?
b37f23
-		BCM5974_WELLSPRING_MODE_VENDOR_VALUE :
b37f23
-		BCM5974_WELLSPRING_MODE_NORMAL_VALUE;
b37f23
+	data[c->um_switch_idx] = on ? c->um_switch_on : c->um_switch_off;
b37f23
 
b37f23
 	/* write configuration */
b37f23
 	size = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
b37f23
 			BCM5974_WELLSPRING_MODE_WRITE_REQUEST_ID,
b37f23
 			USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
b37f23
-			BCM5974_WELLSPRING_MODE_REQUEST_VALUE,
b37f23
-			BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
b37f23
+			c->um_req_val, c->um_req_idx, data, c->um_size, 5000);
b37f23
 
b37f23
-	if (size != 8) {
b37f23
+	if (size != c->um_size) {
b37f23
 		dev_err(&dev->intf->dev, "could not write to device\n");
b37f23
 		retval = -EIO;
b37f23
 		goto out;
b37f23
--- a/drivers/input/mouse/synaptics.c	2016-01-23 00:53:07.000000000 -0800
b37f23
+++ b/drivers/input/mouse/synaptics.c	2016-03-08 13:50:00.835861449 -0800
b37f23
@@ -1724,12 +1724,12 @@ static int __synaptics_init(struct psmou
b37f23
 	priv->pkt_type = SYN_MODEL_NEWABS(priv->model_id) ? SYN_NEWABS : SYN_OLDABS;
b37f23
 
b37f23
 	psmouse_info(psmouse,
b37f23
-		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
b37f23
+		     "Touchpad model: %ld, fw: %ld.%ld, id: %#lx, caps: %#lx/%#lx/%#lx/%#lx, board id: %lu, fw id: %lu\n",
b37f23
 		     SYN_ID_MODEL(priv->identity),
b37f23
 		     SYN_ID_MAJOR(priv->identity), SYN_ID_MINOR(priv->identity),
b37f23
 		     priv->model_id,
b37f23
 		     priv->capabilities, priv->ext_cap, priv->ext_cap_0c,
b37f23
-		     priv->board_id, priv->firmware_id);
b37f23
+		     priv->ext_cap_10, priv->board_id, priv->firmware_id);
b37f23
 
b37f23
 	set_input_params(psmouse, priv);
b37f23