patches to settle i8042 with Intel MID platforms
Subsystems (2)
cover patches to settle i8042 with Intel MID platforms
From: Feng Tang <[email protected]>
Hi All,
Some x86 platforms like intel MID platforms don't have i8042 controllers, and i8042 driver's probe to some non-exist legacy IO ports may hang the MID processor.
Current solution for this is add dependency of SERIO_I8042 over !X86_MRST, then if we build a x86 kernel image with X86_MRST=y, it won't have i8042 driver support over common x86 platforms.
So we add a i8042 pre-detect hook into x86_platforms ops, so that i8042 driver can use it to run-time judge whether to go on with probe process.
Please review these patches.
Thanks,
Feng
----------------
Feng Tang (5):
x86: add i8042 pre-detection hook to x86_platform_ops x86, mrst: add i8042_detect API for Moorestwon platform Revert "Input: do not force selecting i8042 on Moorestown" Revert "Input: fixup X86_MRST selects"
input: i8042 - add runtime check in x86's i8042_platform_init
arch/x86/include/asm/x86_init.h | 2 ++ arch/x86/kernel/mrst.c | 7 +++++++ arch/x86/kernel/x86_init.c | 4 +++- drivers/input/keyboard/Kconfig | 4 ++-- drivers/input/mouse/Kconfig | 2 +- drivers/input/serio/Kconfig | 2 +- drivers/input/serio/i8042-x86ia64io.h | 4 ++++ 7 files changed, 20 insertions(+), 5 deletions(-)
PATCH 1/5 x86: add i8042 pre-detection hook to x86_platform_ops
From: Feng Tang <[email protected]>
Some x86 platforms like intel MID platforms don't have i8042 controllers, and i8042 driver's probe to some legacy IO ports may hang the MID processor. With this hook, i8042 driver can runtime check and skip the probe when the pretection fail which also saves some probe time
--- arch/x86/include/asm/x86_init.h | 2 ++ arch/x86/kernel/x86_init.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/include/asm/x86_init.h +2 -0
@@ -142,6 +142,7 @@ struct x86_cpuinit_ops {* @set_wallclock: set time back to HW clock * @is_untracked_pat_range exclude from PAT logic * @nmi_init enable NMI on cpus +* @i8042_detect pre-detect if i8042 controller exists */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );
@@ -150,6 +151,7 @@ struct x86_platform_ops {void (*iommu_shutdown)(void );bool (*is_untracked_pat_range)(u64 start,u64 end);void (*nmi_init)(void ); +int (*i8042_detect)(void ); };extern struct x86_init_ops x86_init;
arch/x86/kernel/x86_init.c +3 -1
@@ -85,6 +85,7 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { };static void default_nmi_init (void ) { }; +static int default_i8042_detect (void ) {return 1 ; };struct x86_platform_ops x86_platform = { .calibrate_tsc = native_calibrate_tsc,
@@ -92,5 +93,6 @@ struct x86_platform_ops x86_platform = { .set_wallclock = mach_set_rtc_mmss, .iommu_shutdown = iommu_shutdown_noop, .is_untracked_pat_range = is_ISA_range, - .nmi_init = default_nmi_init + .nmi_init = default_nmi_init, + .i8042_detect = default_i8042_detect };
Signature · 1 line
1.7.0.4
PATCH 2/5 x86, mrst: add i8042_detect API for Moorestwon platform
In reply to [email protected]From: Feng Tang <[email protected]>
It will just return 0 as there is no i8042 controller
--- arch/x86/kernel/mrst.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/kernel/mrst.c +7 -0
@@ -216,6 +216,12 @@ static void __init mrst_setup_boot_clock(void)setup_boot_APIC_clock (); }; +/* MID systems don't have i8042 controller */ +static int mrst_i8042_detect (void ) +{ +return 0 ; +} +/* * Moorestown specific x86_init function overrides and early setup * calls.
@@ -233,6 +239,7 @@ void __init x86_mrst_early_setup(void) x86_cpuinit.setup_percpu_clockev = mrst_setup_secondary_clock; x86_platform.calibrate_tsc = mrst_calibrate_tsc; + x86_platform.i8042_detect = mrst_i8042_detect; x86_init.pci.init = pci_mrst_init; x86_init.pci.fixup_irqs = x86_init_noop;
Signature · 1 line
1.7.0.4
PATCH 3/5 Revert "Input: do not force selecting i8042 on Moorestown"
In reply to [email protected]From: Feng Tang <[email protected]>
This reverts commit 685afae02557a178185a4be36f58332976e79f63.
After adding x86_platform's detection for i8042 controller, we don't need the force dependency on !X86_MRST any more
--- drivers/input/keyboard/Kconfig | 2 +- drivers/input/mouse/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/input/keyboard/Kconfig +1 -1
@@ -73,7 +73,7 @@ config KEYBOARD_ATKBD default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
drivers/input/mouse/Kconfig +1 -1
@@ -17,7 +17,7 @@ config MOUSE_PS2 default y select SERIO select SERIO_LIBPS2 - select SERIO_I8042 if X86 && !X86_MRST + select SERIO_I8042 if X86 select SERIO_GSCPS2 if GSC help Say Y here if you have a PS/2 mouse connected to your system. This
Signature · 1 line
1.7.0.4
PATCH 4/5 Revert "Input: fixup X86_MRST selects"
In reply to [email protected]From: Feng Tang <[email protected]>
This reverts commit 0b28bac5aef7bd1ab213723df031e61db9ff151a.
After adding x86_platform's detection for i8042 controller, we don't need the force dependency on !X86_MRST any more
--- drivers/input/keyboard/Kconfig | 2 +- drivers/input/serio/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/input/keyboard/Kconfig +1 -1
@@ -69,7 +69,7 @@ config KEYBOARD_ATARI module will be called atakbd. config KEYBOARD_ATKBD - tristate "AT keyboard" if EMBEDDED || !X86 || X86_MRST + tristate "AT keyboard" if EMBEDDED || !X86 default y select SERIO select SERIO_LIBPS2
drivers/input/serio/Kconfig +1 -1
@@ -22,7 +22,7 @@ config SERIO_I8042 tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 default y depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ - (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !X86_MRST + (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN help i8042 is the chip over which the standard AT keyboard and PS/2 mouse are connected to the computer. If you use these devices,
Signature · 1 line
1.7.0.4
PATCH 5/5 input: i8042 - add runtime check in x86's i8042_platform_init
In reply to [email protected]From: Feng Tang <[email protected]>
Then it will first check x86_platforms's i8042 detection result, then go on with normal probe.
--- drivers/input/serio/i8042-x86ia64io.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/input/serio/i8042-x86ia64io.h +4 -0
@@ -840,6 +840,10 @@ static int __init i8042_platform_init(void) {int retval; +/* Just return if pre-detection shows no i8042 controller exist */ +if (!x86_platform.i8042_detect ()) +return -ENODEV ; +/* * On ix86 platforms touching the i8042 data register region can do really * bad things. Because of this the region is always reserved on ix86 boxes.
Signature · 1 line
1.7.0.4
Re: [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
Hi Feng,
Quoted 16 lines · On Friday, July 02, 2010 01:35:16 am [email protected] wrote:
From: Feng Tang <[email protected]>
Then it will first check x86_platforms's i8042 detection result, then go on with normal probe.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Feng Tang <[email protected]>--- drivers/input/serio/i8042-x86ia64io.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/drivers/input/serio/i8042-x86ia64io.hindex 6168469..2e14fc5 100644
drivers/input/serio/i8042-x86ia64io.h static int __init i8042_platform_init(void) · line 846
Quoted 7 lines
drivers/input/serio/i8042-x86ia64io.h +4
-0@@ -840,6 +840,10 @@ static int __init i8042_platform_init(void) {int retval; +/* Just return if pre-detection shows no i8042 controller exist */ +if (!x86_platform.i8042_detect ()) +return -ENODEV ; +
I think this needs to be protected with "#ifdef CONFIG_X86" as the file is shared between X86 and IA64.
Thanks,
Dmitry
Re: [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
In reply to [email protected]Quoted 16 lines · On Fri, 2 Jul 2010, [email protected] wrote:
From: Feng Tang <[email protected]>
Then it will first check x86_platforms's i8042 detection result, then go on with normal probe.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Feng Tang <[email protected]>--- drivers/input/serio/i8042-x86ia64io.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)drivers/input/serio/i8042-x86ia64io.h +0
-0
drivers/input/serio/i8042-x86ia64io.h static int __init i8042_platform_init(void) · line 845
Quoted 6 lines
drivers/input/serio/i8042-x86ia64io.h +3
-0@@ -840,6 +840,10 @@ static int __init i8042_platform_init(void) {int retval; +/* Just return if pre-detection shows no i8042 controller exist */ +if (!x86_platform.i8042_detect ()) +return -ENODEV ;
That's going to break IA64 :(
Thanks,
tglx
H. Peter Anvin
reviewerRe: [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
[Cc: Tony Luck]
Quoted 21 lines · Thomas Gleixner
Quoted 19 lines · On Fri, 2 Jul 2010, [email protected] wrote:
From: Feng Tang <[email protected]>
Then it will first check x86_platforms's i8042 detection result, then go on with normal probe.
Cc Dmitry Torokhov <[email protected]>Signed-off-by Feng Tang <[email protected]>--- drivers/input/serio/i8042-x86ia64io.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)drivers/input/serio/i8042-x86ia64io.h +0
-0@@ -840,6 +840,10 @@ static int __init i8042_platform_init(void) {int retval;
Quoted 6 lines
drivers/input/serio/i8042-x86ia64io.h static int __init i8042_platform_init(void) · line 845
Quoted 3 lines
drivers/input/serio/i8042-x86ia64io.h +3
-0+/* Just return if pre-detection shows no i8042 controller exist */ +if (!x86_platform.i8042_detect ()) +return -ENODEV ;That's going to break IA64 :(
I have to say there is an awful lot of code in that file which is specific to x86 (more so than IA64)... anyone has a feel if it would make sense to break it up?
-hpa
Re: [PATCH 5/5] input: i8042 - add runtime check in x86's i8042_platform_init
Quoted 3 lines
I have to say there is an awful lot of code in that file which is specific to x86 (more so than IA64)... anyone has a feel if it would make sense to break it up?
Almost all of the X86 specific lines are actually just data definitions for dmi_system_id structures that list systems that need special handling. Many (most) of the recent changes to this file are adding new systems to these structures.
We could push them all out into a separate file (as shown in the patch below) ... then the remainining CONFIG_X86 lines in i8042-x86ia64io.h look a lot less imposing. But I'm not sure whether this really gains anything.
I don't think a naive split of the file into x86 and ia64 versions would be a good idea ... apart from those massive structures there are a fairly small number of arch specific lines (7 __ia64__ lines and 18 CONFIG_X86 lines out of 353 total lines).
-Tony
---
drivers/input/serio/i8042-dmi.h | 535 +++++++++++++++++++++++++++++++++ drivers/input/serio/i8042-x86ia64io.h | 533 +-------------------------------- 2 files changed, 536 insertions(+), 532 deletions(-) create mode 100644 drivers/input/serio/i8042-dmi.h
drivers/input/serio/i8042-dmi.h new file +535 -0
@@ -0,0 +1,535 @@ +#ifndef _I8042_DMI_H +#define _I8042_DMI_H + +#include <linux/dmi.h> + +static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { + { +/* +* Arima-Rioworks HDAMB - +* AUX LOOP command does not raise AUX IRQ +*/ + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"RIOWORKS" ), +DMI_MATCH (DMI_BOARD_NAME ,"HDAMB" ), +DMI_MATCH (DMI_BOARD_VERSION ,"Rev E" ), + }, + }, + { +/* ASUS G1S */ + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"ASUSTeK Computer Inc." ), +DMI_MATCH (DMI_BOARD_NAME ,"G1S" ), +DMI_MATCH (DMI_BOARD_VERSION ,"1.0" ), + }, + }, + { +/* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */ + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"ASUSTeK Computer INC." ), +DMI_MATCH (DMI_BOARD_NAME ,"P/I-P65UP5" ), +DMI_MATCH (DMI_BOARD_VERSION ,"REV 2.X" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Compaq" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"ProLiant" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"8500" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Compaq" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"ProLiant" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"DL760" ), + }, + }, + { +/* OQO Model 01 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"OQO" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"ZEPTO" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"00" ), + }, + }, + { +/* ULI EV4873 - AUX LOOP does not work properly */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ULI" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"EV4873" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"5a" ), + }, + }, + { +/* Microsoft Virtual Machine */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Microsoft Corporation" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Virtual Machine" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"VS2005R2" ), + }, + }, + { +/* Medion MAM 2070 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Notebook" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"MAM 2070" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"5a" ), + }, + }, + { +/* Blue FB5601 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"blue" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"FB5601" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"M606" ), + }, + }, + { +/* Gigabyte M912 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"M912" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"01" ), + }, + }, + { +/* Gigabyte M1022M netbook */ + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"Gigabyte Technology Co.,Ltd." ), +DMI_MATCH (DMI_BOARD_NAME ,"M1022E" ), +DMI_MATCH (DMI_BOARD_VERSION ,"1.02" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP Pavilion dv9700" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"Rev 1" ), + }, + }, + { } +}; + +/* +* 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 const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { + { +/* Fujitsu Lifebook P7010/P7010D */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"P7010" ), + }, + }, + { +/* Fujitsu Lifebook P7010 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU SIEMENS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"0000000000" ), + }, + }, + { +/* Fujitsu Lifebook P5020D */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"LifeBook P Series" ), + }, + }, + { +/* Fujitsu Lifebook S2000 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"LifeBook S Series" ), + }, + }, + { +/* Fujitsu Lifebook S6230 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"LifeBook S6230" ), + }, + }, + { +/* Fujitsu T70H */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"FMVLT70H" ), + }, + }, + { +/* Fujitsu-Siemens Lifebook T3010 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU SIEMENS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"LIFEBOOK T3010" ), + }, + }, + { +/* Fujitsu-Siemens Lifebook E4010 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU SIEMENS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"LIFEBOOK E4010" ), + }, + }, + { +/* Fujitsu-Siemens Amilo Pro 2010 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU SIEMENS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"AMILO Pro V2010" ), + }, + }, + { +/* Fujitsu-Siemens Amilo Pro 2030 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU SIEMENS" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"AMILO PRO V2030" ), + }, + }, + { +/* +* No data is coming from the touchscreen unless KBC +* is in legacy mode. +*/ +/* Panasonic CF-29 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Matsushita" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"CF-29" ), + }, + }, + { +/* +* HP Pavilion DV4017EA - +* errors on MUX ports are reported without raising AUXDATA +* causing "spurious NAK" messages. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Pavilion dv4000 (EA032EA#ABF)" ), + }, + }, + { +/* +* HP Pavilion ZT1000 - +* like DV4017EA does not raise AUXERR for errors on MUX ports. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP Pavilion Notebook PC" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"HP Pavilion Notebook ZT1000" ), + }, + }, + { +/* +* HP Pavilion DV4270ca - +* like DV4017EA does not raise AUXERR for errors on MUX ports. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Pavilion dv4000 (EH476UA#ABL)" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Satellite P10" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"EQUIUM A110" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ALIENWARE" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Sentia" ), + }, + }, + { +/* Sharp Actius MM20 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"SHARP" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"PC-MM20 Series" ), + }, + }, + { +/* Sony Vaio FS-115b */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-FS115B" ), + }, + }, + { +/* +* Sony Vaio FZ-240E - +* reset and GET ID commands issued via KBD port are +* sometimes being delivered to AUX3. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-FZ240E" ), + }, + }, + { +/* Amoi M636/A737 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Amoi Electronics CO.,LTD." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"M636/A737 platform" ), + }, + }, + { +/* Lenovo 3000 n100 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"076804U" ), + }, + }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 1360" ), + }, + }, + { +/* Gericom Bellagio */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Gericom" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"N34AS6" ), + }, + }, + { +/* IBM 2656 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"IBM" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"2656" ), + }, + }, + { +/* Dell XPS M1530 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"XPS M1530" ), + }, + }, + { +/* Compal HEL80I */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"COMPAL" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HEL80I" ), + }, + }, + { +/* Dell Vostro 1510 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Vostro1510" ), + }, + }, + { +/* Acer Aspire 5536 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5536" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"0100" ), + }, + }, + { } +}; + +static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { + { +/* MSI Wind U-100 */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"U-100" ), +DMI_MATCH (DMI_BOARD_VENDOR ,"MICRO-STAR INTERNATIONAL CO., LTD" ), + }, + }, + { +/* LG Electronics X110 */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"X110" ), +DMI_MATCH (DMI_BOARD_VENDOR ,"LG Electronics Inc." ), + }, + }, + { +/* Acer Aspire One 150 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"AOA150" ), + }, + }, + { +/* Advent 4211 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"DIXONSXP" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Advent 4211" ), + }, + }, + { +/* Medion Akoya Mini E1210 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"E1210" ), + }, + }, + { +/* Medion Akoya E1222 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MEDION" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"E122X" ), + }, + }, + { +/* Mivvy M310 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"VIOOO" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"N10" ), + }, + }, + { +/* Dell Vostro 1320 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Vostro 1320" ), + }, + }, + { +/* Dell Vostro 1520 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Vostro 1520" ), + }, + }, + { +/* Dell Vostro 1720 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Vostro 1720" ), + }, + }, + { } +}; + +#ifdef CONFIG_PNP +static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { + { +/* Intel MBO Desktop D845PESV */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"D845PESV" ), +DMI_MATCH (DMI_BOARD_VENDOR ,"Intel Corporation" ), + }, + }, + { +/* MSI Wind U-100 */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"U-100" ), +DMI_MATCH (DMI_BOARD_VENDOR ,"MICRO-STAR INTERNATIONAL CO., LTD" ), + }, + }, + { } +}; + +static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { + { + .matches = { +DMI_MATCH (DMI_CHASSIS_TYPE ,"8" ),/* Portable */ + }, + }, + { + .matches = { +DMI_MATCH (DMI_CHASSIS_TYPE ,"9" ),/* Laptop */ + }, + }, + { + .matches = { +DMI_MATCH (DMI_CHASSIS_TYPE ,"10" ),/* Notebook */ + }, + }, + { + .matches = { +DMI_MATCH (DMI_CHASSIS_TYPE ,"14" ),/* Sub-Notebook */ + }, + }, + { } +}; +#endif + +/* +* Some Wistron based laptops need us to explicitly enable the 'Dritek +* keyboard extension' to make their extra keys start generating scancodes. +* Originally, this was just confined to older laptops, but a few Acer laptops +* have turned up in 2007 that also need this again. +*/ +static const struct dmi_system_id __initconst i8042_dmi_dritek_table[] = { + { +/* Acer Aspire 5610 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5610" ), + }, + }, + { +/* Acer Aspire 5630 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5630" ), + }, + }, + { +/* Acer Aspire 5650 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5650" ), + }, + }, + { +/* Acer Aspire 5680 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5680" ), + }, + }, + { +/* Acer Aspire 5720 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 5720" ), + }, + }, + { +/* Acer Aspire 9110 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Aspire 9110" ), + }, + }, + { +/* Acer TravelMate 660 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"TravelMate 660" ), + }, + }, + { +/* Acer TravelMate 2490 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"TravelMate 2490" ), + }, + }, + { +/* Acer TravelMate 4280 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"TravelMate 4280" ), + }, + }, + { } +}; + +#endif /*_I8042_DMI_H*/
drivers/input/serio/i8042-x86ia64io.h +1 -532
539 lines not on this page · raw message