Commit 39ea32ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input layer fixes from Dmitry Torokhov:
 "The changes are limited to adding new VID/PID combinations to drivers
  to enable support for new versions of hardware, most notably hardware
  found in new MacBook Pro Retina boxes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add Andamiro Pump It Up pad
  Input: xpad - add signature for Razer Onza Tournament Edition
  Input: xpad - handle all variations of Mad Catz Beat Pad
  Input: bcm5974 - Add support for 2012 MacBook Pro Retina
  HID: add support for 2012 MacBook Pro Retina
parents 8488e408 e76b8ee2

drivers/hid/hid-apple.c

+6 −0
Original line number Diff line number Diff line
@@ -517,6 +517,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_WELLSPRING5A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_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

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

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_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) },
@@ -1995,6 +1998,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MCT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HYBRID) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_HEATCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_BEATPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },
@@ -2089,6 +2093,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_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

+6 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI	0x024c

#define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO	0x024d

#define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS	0x024e

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI	0x0262

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO	0x0263

#define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS	0x0264

#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
@@ -518,6 +521,9 @@ 
#define USB_DEVICE_ID_CRYSTALTOUCH	0x0006

#define USB_DEVICE_ID_CRYSTALTOUCH_DUAL	0x0007



#define USB_VENDOR_ID_MADCATZ		0x0738

#define USB_DEVICE_ID_MADCATZ_BEATPAD	0x4540



#define USB_VENDOR_ID_MCC		0x09db

#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a

drivers/input/joystick/xpad.c

+5 −1
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static const struct xpad_device { 
	{ 0x0c12, 0x880a, "Pelican Eclipse PL-2023", 0, XTYPE_XBOX },

	{ 0x0c12, 0x8810, "Zeroplus Xbox Controller", 0, XTYPE_XBOX },

	{ 0x0c12, 0x9902, "HAMA VibraX - *FAULTY HARDWARE*", 0, XTYPE_XBOX },

	{ 0x0d2f, 0x0002, "Andamiro Pump It Up pad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x0e4c, 0x1097, "Radica Gamester Controller", 0, XTYPE_XBOX },

	{ 0x0e4c, 0x2390, "Radica Games Jtech Controller", 0, XTYPE_XBOX },

	{ 0x0e6f, 0x0003, "Logic3 Freebird wireless Controller", 0, XTYPE_XBOX },
@@ -164,6 +165,7 @@ static const struct xpad_device { 
	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },

	{ 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }

};
@@ -238,12 +240,14 @@ static struct usb_device_id xpad_table [] = { 
	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x046d),		/* Logitech X-Box 360 style controllers */

	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */

	{ USB_DEVICE(0x0738, 0x4540) },		/* Mad Catz Beat Pad */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x12ab),		/* X-Box 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Harminix Rock Band Guitar and Drums */

	XPAD_XBOX360_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOX360_VENDOR(0x1689),		/* Razer Onza */

	{ }

};

drivers/input/mouse/bcm5974.c

+20 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI	0x0252

#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO	0x0253

#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS	0x0254

/* MacbookPro10,1 (unibody, June 2012) */

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI	0x0262

#define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO	0x0263

#define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS	0x0264



#define BCM5974_DEVICE(prod) {					\

	.match_flags = (USB_DEVICE_ID_MATCH_DEVICE |		\
@@ -128,6 +132,10 @@ static const struct usb_device_id bcm5974_table[] = { 
	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),

	/* MacbookPro10,1 */

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO),

	BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS),

	/* Terminating entry */

	{}

};
@@ -354,6 +362,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { 
		{ DIM_X, DIM_X / SN_COORD, -4620, 5140 },

		{ DIM_Y, DIM_Y / SN_COORD, -150, 6600 }

	},

	{

		USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI,

		USB_DEVICE_ID_APPLE_WELLSPRING7_ISO,

		USB_DEVICE_ID_APPLE_WELLSPRING7_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, -4750, 5280 },

		{ DIM_Y, DIM_Y / SN_COORD, -150, 6730 }

	},

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE