Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47340bd9 authored by Andy Botting's avatar Andy Botting Committed by Dmitry Torokhov
Browse files

Input: bcm5974 - add support for MacBookPro8 



This patch add multitouch support for the MacBookPro8,1 and
MacBookPro8,2 models.

Cc: stable@kernel.org
Signed-off-by: default avatarAndy Botting <andy@andybotting.com>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 84eb5aa6

drivers/hid/hid-apple.c

+6 −0
Original line number Diff line number Diff line
@@ -481,6 +481,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-core.c

+6 −0
Original line number Diff line number Diff line
@@ -1302,6 +1302,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
@@ -1801,6 +1804,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ }

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI	0x0242

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO	0x0243

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS	0x0244

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246

#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

drivers/input/mouse/bcm5974.c

+20 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI	0x0242

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO	0x0243

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS	0x0244

/* Macbook8 (unibody, March 2011) */

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246

#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247



#define BCM5974_DEVICE(prod) {					\

	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
@@ -96,6 +100,10 @@ static const struct usb_device_id bcm5974_table[] = { 
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),

	/* MacbookPro8 */

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

	/* Terminating entry */

	{}

};
@@ -274,6 +282,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { 
		{ DIM_X, DIM_X / SN_COORD, -4616, 5112 },

		{ DIM_Y, DIM_Y / SN_COORD, -142, 5234 }

	},

	{

		USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI,

		USB_DEVICE_ID_APPLE_WELLSPRING5_ISO,

		USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,

		HAS_INTEGRATED_BUTTON,

		0x84, sizeof(struct bt_data),

		0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,

		{ DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },

		{ DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },

		{ DIM_X, DIM_X / SN_COORD, -4415, 5050 },

		{ DIM_Y, DIM_Y / SN_COORD, -55, 6680 }

	},

	{}

};