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

Commit b9217862 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 updates from Dmitry Torokhov:
 "A few quirks for i8042/AT keyboards and a small device tree doc fix
  for Atmel Touchscreens"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: atmel_mxt_ts - fix merge in DT documentation
  Input: i8042 - also set the firmware id for MUXed ports
  Input: i8042 - add nomux quirk for Avatar AVIU-145A6
  Input: i8042 - add Fujitsu U574 to no_timeout dmi table
  Input: atkbd - do not try 'deactivate' keyboard on any LG laptops
parents f3b59331 807362cd

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ Required properties: 


Optional properties for main touchpad device:



- linux,gpio-keymap: An array of up to 4 entries indicating the Linux

    keycode generated by each GPIO. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

drivers/input/keyboard/atkbd.c

+0 −8
Original line number Diff line number Diff line
@@ -1791,14 +1791,6 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { 
	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LW25-B7HV"),

		},

		.callback = atkbd_deactivate_fixup,

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),

			DMI_MATCH(DMI_PRODUCT_NAME, "P1-J273B"),

		},

		.callback = atkbd_deactivate_fixup,

	},

drivers/input/serio/i8042-x86ia64io.h

+15 −0
Original line number Diff line number Diff line
@@ -465,6 +465,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),

		},

	},

	{

		/* Avatar AVIU-145A6 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel"),

			DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"),

		},

	},

	{ }

};
@@ -608,6 +615,14 @@ static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),

		},

	},

	{

		/* Fujitsu U574 laptop */

		/* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),

			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"),

		},

	},

	{ }

};

drivers/input/serio/i8042.c

+2 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,8 @@ static int __init i8042_create_aux_port(int idx) 
	} else {

		snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);

		snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);

		strlcpy(serio->firmware_id, i8042_aux_firmware_id,

			sizeof(serio->firmware_id));

	}



	port->serio = serio;