The patch titled input: add a DMI table for the i8042.reset option; make MSI Wind U-100 work has been added to the -mm tree. Its filename is input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: input: add a DMI table for the i8042.reset option; make MSI Wind U-100 work From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> There are several DMI tables in the i8042 (keyboard) driver already, but not one for the i8042.reset option. This patch adds such an option (which also sets the nonfatal flag so that if the reset fails, the keyboard still works). Two users for this table are added as well, the MSI Wind U-100 and the LG X110. The MSI Wind also needs to be in the "don't trust the pnp data" for the touchpad to work on my machine. Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/input/serio/i8042-x86ia64io.h | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff -puN drivers/input/serio/i8042-x86ia64io.h~input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work drivers/input/serio/i8042-x86ia64io.h --- a/drivers/input/serio/i8042-x86ia64io.h~input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work +++ a/drivers/input/serio/i8042-x86ia64io.h @@ -378,6 +378,13 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), }, }, + { + .ident = "MSI Wind U-100", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "U-100"), + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + }, + }, { } }; #endif @@ -448,6 +455,25 @@ static struct dmi_system_id __initdata i { } }; +static struct dmi_system_id __initdata i8042_dmi_reset_table[] = { + { + .ident = "MSI Wind U-100", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "U-100"), + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + }, + }, + { + .ident = "LG Electronics X110", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "X110"), + DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."), + }, + }, + { } +}; + + #endif /* CONFIG_X86 */ #ifdef CONFIG_PNP @@ -564,6 +590,11 @@ static int __init i8042_pnp_init(void) i8042_nopnp = 1; #endif + if (dmi_check_system(i8042_dmi_reset_table)) { + i8042_reset = 1; + i8042_nonfatal = 1; + } + if (i8042_nopnp) { printk(KERN_INFO "i8042: PNP detection disabled\n"); return 0; _ Patches currently in -mm which might be from arjan@xxxxxxxxxxxxxxx are origin.patch linux-next.patch drivers-consolidate-driver_probe_done-loops-into-one-place.patch drivers-consolidate-driver_probe_done-loops-into-one-place-fix.patch drivers-consolidate-driver_probe_done-loops-into-one-place-checkpatch-fixes.patch resume-wait-for-device-probing-to-finish.patch input-introduce-a-tougher-i8042reset.patch input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work.patch pci-use-pci_ioremap_bar-in-drivers-serial.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html