lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-11-22 09:18:06 -08:00
parent 1b464d8429 77f6ca5a62
commit 866d43c9ea
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/input/mouse/elantech.c
View File

@@ -1210,18 +1210,28 @@ static int elantech_reconnect(struct psmouse *psmouse)
*/ */
static int elantech_set_properties(struct elantech_data *etd) static int elantech_set_properties(struct elantech_data *etd)
{ {
/* This represents the version of IC body. */
int ver = (etd->fw_version & 0x0f0000) >> 16; 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) if (etd->fw_version < 0x020030 || etd->fw_version == 0x020600)
etd->hw_version = 1; etd->hw_version = 1;
else if (etd->fw_version < 0x150600) else {
switch (ver) {
case 2:
case 4:
etd->hw_version = 2; etd->hw_version = 2;
else if (ver == 5) break;
case 5:
etd->hw_version = 3; etd->hw_version = 3;
else if (ver == 6) break;
case 6:
etd->hw_version = 4; etd->hw_version = 4;
else break;
default:
return -1; return -1;
}
}
/* /*
* Turn on packet checking by default. * Turn on packet checking by default.

1
drivers/input/serio/ams_delta_serio.c
View File

@@ -24,6 +24,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/serio.h> #include <linux/serio.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <plat/board-ams-delta.h> #include <plat/board-ams-delta.h>

14
drivers/input/serio/i8042-x86ia64io.h
View File

@@ -431,6 +431,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), 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"), 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"),
},
},
{ } { }
}; };