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

Commit f9d1e7f3 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 subsystem fixes from Dmitry Torokhov:
 "Just minor driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: twl4030-vibra - do not reparent to grandparent
  Input: twl6040-vibra - do not reparent to grandparent
  Input: twl6040-vibra - ignore return value of schedule_work
  Input: twl6040-vibra - fix NULL pointer dereference by removing workqueue
  Input: pmic8xxx-pwrkey - fix algorithm for converting trigger delay
  Input: arizona-haptic - don't assign input_dev parent
  Input: clarify we want BTN_TOOL_<name> on proximity
  Input: xpad - add Mad Catz FightStick TE 2 VID/PID
  Input: gtco - fix crash on detecting device without endpoints
parents 09502d9f dcc75971

Documentation/input/event-codes.txt

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ A few EV_ABS codes have special meanings: 
    proximity of the device and while the value of the BTN_TOUCH code is 0. If

    the input device may be used freely in three dimensions, consider ABS_Z

    instead.

  - BTN_TOOL_<name> should be set to 1 when the tool comes into detectable

    proximity and set to 0 when the tool leaves detectable proximity.

    BTN_TOOL_<name> signals the type of tool that is currently detected by the

    hardware and is otherwise independent of ABS_DISTANCE and/or BTN_TOUCH.



* ABS_MT_<name>:

  - Used to describe multitouch input events. Please see

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static const struct xpad_device { 
	{ 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x0738, 0x4740, "Mad Catz Beat Pad", 0, XTYPE_XBOX360 },

	{ 0x0738, 0x4a01, "Mad Catz FightStick TE 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },

	{ 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 },

	{ 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },
@@ -304,6 +305,7 @@ static struct usb_device_id xpad_table[] = { 
	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_XBOXONE_VENDOR(0x0738),		/* Mad Catz FightStick TE 2 */

	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 */

drivers/input/misc/arizona-haptics.c

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static int arizona_haptics_probe(struct platform_device *pdev) 
	input_set_drvdata(haptics->input_dev, haptics);



	haptics->input_dev->name = "arizona:haptics";

	haptics->input_dev->dev.parent = pdev->dev.parent;

	haptics->input_dev->close = arizona_haptics_close;

	__set_bit(FF_RUMBLE, haptics->input_dev->ffbit);

drivers/input/misc/pmic8xxx-pwrkey.c

+4 −3
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) 
	if (of_property_read_u32(pdev->dev.of_node, "debounce", &kpd_delay))

		kpd_delay = 15625;



	if (kpd_delay > 62500 || kpd_delay == 0) {

	/* Valid range of pwr key trigger delay is 1/64 sec to 2 seconds. */

	if (kpd_delay > USEC_PER_SEC * 2 || kpd_delay < USEC_PER_SEC / 64) {

		dev_err(&pdev->dev, "invalid power key trigger delay\n");

		return -EINVAL;

	}
@@ -385,8 +386,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) 
	pwr->name = "pmic8xxx_pwrkey";

	pwr->phys = "pmic8xxx_pwrkey/input0";



	delay = (kpd_delay << 10) / USEC_PER_SEC;

	delay = 1 + ilog2(delay);

	delay = (kpd_delay << 6) / USEC_PER_SEC;

	delay = ilog2(delay);



	err = regmap_read(regmap, PON_CNTL_1, &pon_cntl);

	if (err < 0) {

drivers/input/misc/twl4030-vibra.c

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ static int twl4030_vibra_probe(struct platform_device *pdev) 


	info->input_dev->name = "twl4030:vibrator";

	info->input_dev->id.version = 1;

	info->input_dev->dev.parent = pdev->dev.parent;

	info->input_dev->close = twl4030_vibra_close;

	__set_bit(FF_RUMBLE, info->input_dev->ffbit);