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

Commit 49b1622b 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 couple of new device IDs added to Elan i2c touchpad controller
   driver

 - another entry in i8042 reset quirk list

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
  Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
  MAINTAINERS: Add file patterns for serio device tree bindings
  Input: elan_i2c - add ACPI ID for lenovo ideapad 330
parents 3ebb6fb0 384cf428

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7095,6 +7095,7 @@ F: include/uapi/linux/input.h 
F:	include/uapi/linux/input-event-codes.h

F:	include/linux/input/

F:	Documentation/devicetree/bindings/input/

F:	Documentation/devicetree/bindings/serio/

F:	Documentation/input/



INPUT MULTITOUCH (MT) PROTOCOL

drivers/input/mouse/elan_i2c_core.c

+2 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,8 @@ static const struct acpi_device_id elan_acpi_id[] = { 
	{ "ELAN0611", 0 },

	{ "ELAN0612", 0 },

	{ "ELAN0618", 0 },

	{ "ELAN061D", 0 },

	{ "ELAN0622", 0 },

	{ "ELAN1000", 0 },

	{ }

};

drivers/input/serio/i8042-x86ia64io.h

+7 −0
Original line number Diff line number Diff line
@@ -527,6 +527,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"),

		},

	},

	{

		/* Lenovo LaVie Z */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"),

		},

	},

	{ }

};