diff options
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/Kconfig | 13 | ||||
-rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 13 | ||||
-rw-r--r-- | drivers/input/serio/i8042.c | 3 | ||||
-rw-r--r-- | drivers/input/serio/libps2.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/serio_raw.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/serport.c | 1 |
6 files changed, 25 insertions, 7 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index c4b3fbd1a80f..aa533ceffe34 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | config SERIO | 4 | config SERIO |
5 | tristate "Serial I/O support" if EMBEDDED || !X86 | 5 | tristate "Serial I/O support" if EMBEDDED || !X86 |
6 | default y | 6 | default y |
7 | ---help--- | 7 | help |
8 | Say Yes here if you have any input device that uses serial I/O to | 8 | Say Yes here if you have any input device that uses serial I/O to |
9 | communicate with the system. This includes the | 9 | communicate with the system. This includes the |
10 | * standard AT keyboard and PS/2 mouse * | 10 | * standard AT keyboard and PS/2 mouse * |
@@ -22,7 +22,7 @@ config SERIO_I8042 | |||
22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 | 22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 |
23 | default y | 23 | default y |
24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN | 24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN |
25 | ---help--- | 25 | help |
26 | i8042 is the chip over which the standard AT keyboard and PS/2 | 26 | i8042 is the chip over which the standard AT keyboard and PS/2 |
27 | mouse are connected to the computer. If you use these devices, | 27 | mouse are connected to the computer. If you use these devices, |
28 | you'll need to say Y here. | 28 | you'll need to say Y here. |
@@ -35,7 +35,7 @@ config SERIO_I8042 | |||
35 | config SERIO_SERPORT | 35 | config SERIO_SERPORT |
36 | tristate "Serial port line discipline" | 36 | tristate "Serial port line discipline" |
37 | default y | 37 | default y |
38 | ---help--- | 38 | help |
39 | Say Y here if you plan to use an input device (mouse, joystick, | 39 | Say Y here if you plan to use an input device (mouse, joystick, |
40 | tablet, 6dof) that communicates over the RS232 serial (COM) port. | 40 | tablet, 6dof) that communicates over the RS232 serial (COM) port. |
41 | 41 | ||
@@ -49,7 +49,7 @@ config SERIO_SERPORT | |||
49 | config SERIO_CT82C710 | 49 | config SERIO_CT82C710 |
50 | tristate "ct82c710 Aux port controller" | 50 | tristate "ct82c710 Aux port controller" |
51 | depends on X86 | 51 | depends on X86 |
52 | ---help--- | 52 | help |
53 | Say Y here if you have a Texas Instruments TravelMate notebook | 53 | Say Y here if you have a Texas Instruments TravelMate notebook |
54 | equipped with the ct82c710 chip and want to use a mouse connected | 54 | equipped with the ct82c710 chip and want to use a mouse connected |
55 | to the "QuickPort". | 55 | to the "QuickPort". |
@@ -66,7 +66,7 @@ config SERIO_Q40KBD | |||
66 | config SERIO_PARKBD | 66 | config SERIO_PARKBD |
67 | tristate "Parallel port keyboard adapter" | 67 | tristate "Parallel port keyboard adapter" |
68 | depends on PARPORT | 68 | depends on PARPORT |
69 | ---help--- | 69 | help |
70 | Say Y here if you built a simple parallel port adapter to attach | 70 | Say Y here if you built a simple parallel port adapter to attach |
71 | an additional AT keyboard, XT keyboard or PS/2 mouse. | 71 | an additional AT keyboard, XT keyboard or PS/2 mouse. |
72 | 72 | ||
@@ -124,7 +124,7 @@ config HP_SDC | |||
124 | tristate "HP System Device Controller i8042 Support" | 124 | tristate "HP System Device Controller i8042 Support" |
125 | depends on (GSC || HP300) && SERIO | 125 | depends on (GSC || HP300) && SERIO |
126 | default y | 126 | default y |
127 | ---help--- | 127 | help |
128 | This option enables support for the "System Device | 128 | This option enables support for the "System Device |
129 | Controller", an i8042 carrying microcode to manage a | 129 | Controller", an i8042 carrying microcode to manage a |
130 | few miscellaneous devices on some Hewlett Packard systems. | 130 | few miscellaneous devices on some Hewlett Packard systems. |
@@ -168,6 +168,7 @@ config SERIO_MACEPS2 | |||
168 | 168 | ||
169 | config SERIO_LIBPS2 | 169 | config SERIO_LIBPS2 |
170 | tristate "PS/2 driver library" if EMBEDDED | 170 | tristate "PS/2 driver library" if EMBEDDED |
171 | depends on SERIO_I8042 || SERIO_I8042=n | ||
171 | help | 172 | help |
172 | Say Y here if you are using a driver for device connected | 173 | Say Y here if you are using a driver for device connected |
173 | to a PS/2 port, such as PS/2 mouse or standard AT keyboard. | 174 | to a PS/2 port, such as PS/2 mouse or standard AT keyboard. |
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index a39bc4eb902b..a537925f7651 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
@@ -327,6 +327,17 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { | |||
327 | }, | 327 | }, |
328 | }, | 328 | }, |
329 | { | 329 | { |
330 | /* | ||
331 | * Reset and GET ID commands issued via KBD port are | ||
332 | * sometimes being delivered to AUX3. | ||
333 | */ | ||
334 | .ident = "Sony Vaio FZ-240E", | ||
335 | .matches = { | ||
336 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | ||
337 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ240E"), | ||
338 | }, | ||
339 | }, | ||
340 | { | ||
330 | .ident = "Amoi M636/A737", | 341 | .ident = "Amoi M636/A737", |
331 | .matches = { | 342 | .matches = { |
332 | DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."), | 343 | DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."), |
@@ -661,7 +672,7 @@ static void i8042_pnp_exit(void) | |||
661 | static int __init i8042_pnp_init(void) | 672 | static int __init i8042_pnp_init(void) |
662 | { | 673 | { |
663 | char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 }; | 674 | char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 }; |
664 | int pnp_data_busted = false; | 675 | bool pnp_data_busted = false; |
665 | int err; | 676 | int err; |
666 | 677 | ||
667 | #ifdef CONFIG_X86 | 678 | #ifdef CONFIG_X86 |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index bc56e52b945f..a31578170ccc 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
@@ -609,6 +609,8 @@ static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id) | |||
609 | str = i8042_read_status(); | 609 | str = i8042_read_status(); |
610 | if (str & I8042_STR_OBF) { | 610 | if (str & I8042_STR_OBF) { |
611 | data = i8042_read_data(); | 611 | data = i8042_read_data(); |
612 | dbg("%02x <- i8042 (aux_test_irq, %s)", | ||
613 | data, str & I8042_STR_AUXDATA ? "aux" : "kbd"); | ||
612 | if (i8042_irq_being_tested && | 614 | if (i8042_irq_being_tested && |
613 | data == 0xa5 && (str & I8042_STR_AUXDATA)) | 615 | data == 0xa5 && (str & I8042_STR_AUXDATA)) |
614 | complete(&i8042_aux_irq_delivered); | 616 | complete(&i8042_aux_irq_delivered); |
@@ -750,6 +752,7 @@ static int __init i8042_check_aux(void) | |||
750 | * AUX IRQ was never delivered so we need to flush the controller to | 752 | * AUX IRQ was never delivered so we need to flush the controller to |
751 | * get rid of the byte we put there; otherwise keyboard may not work. | 753 | * get rid of the byte we put there; otherwise keyboard may not work. |
752 | */ | 754 | */ |
755 | dbg(" -- i8042 (aux irq test timeout)"); | ||
753 | i8042_flush(); | 756 | i8042_flush(); |
754 | retval = -1; | 757 | retval = -1; |
755 | } | 758 | } |
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 769ba65a585a..f3876acc3e83 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/sched.h> | ||
16 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
17 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
18 | #include <linux/input.h> | 19 | #include <linux/input.h> |
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index b03009bb7468..27fdaaffbb40 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
@@ -9,6 +9,7 @@ | |||
9 | * the Free Software Foundation. | 9 | * the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/sched.h> | ||
12 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
13 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
14 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index b9694b6445d0..6d345112bcb7 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/sched.h> | ||
18 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
20 | #include <linux/init.h> | 21 | #include <linux/init.h> |