Commit 7059c2c0 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 fixes from Dmitry Torokhov:
 "A fix for 'RETRIGEN' handling in Atmel touch controllers that was
  causing lost interrupts on systems using edge-triggered interrupts, a
  quirk for i8042 driver, and a couple more fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atmel_mxt_ts - fix lost interrupts
  Input: xpad - support Ardwiino Controllers
  Input: i8042 - add ByteSpeed touchpad to noloop table
  Input: i8042 - fix error return code in i8042_setup_aux()
  Input: soc_button_array - add missing include
parents 33256ce1 8c3b55a2

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ static const struct xpad_device { 
	{ 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 },

	{ 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 },

	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },

	{ 0x12ab, 0x0303, "Mortal Kombat Klassic FightStick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
@@ -418,6 +419,7 @@ static const struct usb_device_id xpad_table[] = { 
	XPAD_XBOXONE_VENDOR(0x0f0d),		/* Hori Controllers */

	XPAD_XBOX360_VENDOR(0x1038),		/* SteelSeries Controllers */

	XPAD_XBOX360_VENDOR(0x11c9),		/* Nacon GC100XF */

	XPAD_XBOX360_VENDOR(0x1209),		/* Ardwiino 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 */

drivers/input/misc/soc_button_array.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <linux/input.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/kernel.h>

#include <linux/acpi.h>

#include <linux/dmi.h>

drivers/input/serio/i8042-x86ia64io.h

+4 −0
Original line number Diff line number Diff line
@@ -219,6 +219,10 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),

			DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),

		},

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),

		},

	},

	{ }

};

drivers/input/serio/i8042.c

+2 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,8 @@ static int __init i8042_setup_aux(void) 
	if (error)

		goto err_free_ports;



	if (aux_enable())

	error = aux_enable();

	if (error)

		goto err_free_irq;



	i8042_aux_irq_registered = true;

drivers/input/touchscreen/atmel_mxt_ts.c

+2 −2
Original line number Diff line number Diff line
@@ -2183,11 +2183,11 @@ static int mxt_initialize(struct mxt_data *data) 
		msleep(MXT_FW_RESET_TIME);

	}



	error = mxt_acquire_irq(data);

	error = mxt_check_retrigen(data);

	if (error)

		return error;



	error = mxt_check_retrigen(data);

	error = mxt_acquire_irq(data);

	if (error)

		return error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE