2005-05-29 05:03:15

by Dmitry Torokhov

[permalink] [raw]
Subject: [patch 11/13] i8042: dont activate MUX mode on Toshiba Satellite P10

Input: automatically disable MUX mode on Toshiba Satellite P10
because it interferes with ALPS touchpad detection and
causes horrible death on reboot. Since P10 does not have
external PS/2 ports MUX mode does not have any advantages
over legacy mode anyway.

Signed-off-by: Dmitry Torokhov <[email protected]>
---

drivers/input/serio/i8042-x86ia64io.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletion(-)

Index: work/drivers/input/serio/i8042-x86ia64io.h
===================================================================
--- work.orig/drivers/input/serio/i8042-x86ia64io.h
+++ work/drivers/input/serio/i8042-x86ia64io.h
@@ -88,9 +88,11 @@ static struct dmi_system_id __initdata i
};

/*
- * Some Fujitsu notebooks are ahving trouble with touhcpads if
+ * Some Fujitsu notebooks are having trouble with touchpads if
* active multiplexing mode is activated. Luckily they don't have
* external PS/2 ports so we can safely disable it.
+ * ... apparently some Toshibas don't like MUX mode either and
+ * die horrible death on reboot.
*/
static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
{
@@ -121,6 +123,13 @@ static struct dmi_system_id __initdata i
DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"),
},
},
+ {
+ .ident = "Toshiba P10",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"),
+ },
+ },
{ }
};