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

Commit 866d43c9 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ams_delta_serio - include linux/module.h
  Input: elantech - adjust hw_version detection logic
  Input: i8042 - add HP Pavilion dv4s to 'notimeout' and 'nomux' blacklists
parents 1b464d84 77f6ca5a

drivers/input/mouse/elantech.c

+18 −8
Original line number Diff line number Diff line
@@ -1210,18 +1210,28 @@ static int elantech_reconnect(struct psmouse *psmouse) 
 */

static int elantech_set_properties(struct elantech_data *etd)

{

	/* This represents the version of IC body. */

	int ver = (etd->fw_version & 0x0f0000) >> 16;



	/* Early version of Elan touchpads doesn't obey the rule. */

	if (etd->fw_version < 0x020030 || etd->fw_version == 0x020600)

		etd->hw_version = 1;

	else if (etd->fw_version < 0x150600)

	else {

		switch (ver) {

		case 2:

		case 4:

			etd->hw_version = 2;

	else if (ver == 5)

			break;

		case 5:

			etd->hw_version = 3;

	else if (ver == 6)

			break;

		case 6:

			etd->hw_version = 4;

	else

			break;

		default:

			return -1;

		}

	}



	/*

	 * Turn on packet checking by default.

drivers/input/serio/ams_delta_serio.c

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

#include <linux/serio.h>

#include <linux/slab.h>

#include <linux/module.h>



#include <asm/mach-types.h>

#include <plat/board-ams-delta.h>

drivers/input/serio/i8042-x86ia64io.h

+14 −0
Original line number Diff line number Diff line
@@ -431,6 +431,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),

		},

	},

	{

		/* Newer HP Pavilion dv4 models */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),

		},

	},

	{ }

};
@@ -560,6 +567,13 @@ static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"),

		},

	},

	{

		/* Newer HP Pavilion dv4 models */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"),

		},

	},

	{ }

};