diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-24 20:17:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-24 20:17:30 -0500 |
commit | 1b59bab55e36082b1db3dc81bb32475616487a98 (patch) | |
tree | 0cf4af345f159b7056465053c28b5d5089566650 /drivers/input/serio | |
parent | b788769e0641daf90a8d7e800081285f8ca80bd9 (diff) | |
parent | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov:
"Just a swath of driver fixes and cleanups, no new drivers this time
(although ALPS now supports one of the newer protocols, more to come)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
Input: wacom - add support for DTU-1031
Input: wacom - fix wacom->shared guards for dual input devices
Input: edt_ft5x06 - use devm_* functions where appropriate
Input: hyperv-keyboard - pass through 0xE1 prefix
Input: logips2pp - fix spelling s/reciver/receiver/
Input: delete non-required instances of include <linux/init.h>
Input: twl4030-keypad - convert to using managed resources
Input: twl6040-vibra - remove unneeded check for CONFIG_OF
Input: twl4030-keypad - add device tree support
Input: twl6040-vibra - add missing of_node_put
Input: twl4030-vibra - add missing of_node_put
Input: i8042 - cleanup SERIO_I8042 dependencies
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on x86
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on unicore32
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on sparc
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO for SH_CAYMAN
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on powerpc
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on mips
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on IA64
Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on ARM/Footbridge
...
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/Kconfig | 11 | ||||
-rw-r--r-- | drivers/input/serio/altera_ps2.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/ambakmi.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/hyperv-keyboard.c | 4 | ||||
-rw-r--r-- | drivers/input/serio/libps2.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/olpc_apsp.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/pcips2.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/q40kbd.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/rpckbd.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/serio_raw.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 1 |
11 files changed, 11 insertions, 14 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 8541f949778d..aec54e283580 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
@@ -16,14 +16,19 @@ config SERIO | |||
16 | To compile this driver as a module, choose M here: the | 16 | To compile this driver as a module, choose M here: the |
17 | module will be called serio. | 17 | module will be called serio. |
18 | 18 | ||
19 | config ARCH_MIGHT_HAVE_PC_SERIO | ||
20 | bool | ||
21 | help | ||
22 | Select this config option from the architecture Kconfig if | ||
23 | the architecture might use a PC serio device (i8042) to | ||
24 | communicate with keyboard, mouse, etc. | ||
25 | |||
19 | if SERIO | 26 | if SERIO |
20 | 27 | ||
21 | config SERIO_I8042 | 28 | config SERIO_I8042 |
22 | tristate "i8042 PC Keyboard controller" | 29 | tristate "i8042 PC Keyboard controller" |
23 | default y | 30 | default y |
24 | depends on !PARISC && (!ARM || FOOTBRIDGE_HOST) && \ | 31 | depends on ARCH_MIGHT_HAVE_PC_SERIO |
25 | (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ | ||
26 | !ARC | ||
27 | help | 32 | help |
28 | i8042 is the chip over which the standard AT keyboard and PS/2 | 33 | i8042 is the chip over which the standard AT keyboard and PS/2 |
29 | mouse are connected to the computer. If you use these devices, | 34 | mouse are connected to the computer. If you use these devices, |
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index 4777a73cd390..cce69d6b9587 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c | |||
@@ -12,7 +12,6 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/init.h> | ||
16 | #include <linux/input.h> | 15 | #include <linux/input.h> |
17 | #include <linux/serio.h> | 16 | #include <linux/serio.h> |
18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index b7c206db0df8..762b08432de0 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * (at your option) any later version. | 10 | * (at your option) any later version. |
11 | */ | 11 | */ |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/init.h> | ||
14 | #include <linux/serio.h> | 13 | #include <linux/serio.h> |
15 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c index 3a83c3c14b23..613261994621 100644 --- a/drivers/input/serio/hyperv-keyboard.c +++ b/drivers/input/serio/hyperv-keyboard.c | |||
@@ -160,7 +160,9 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev, | |||
160 | if (info & IS_E0) | 160 | if (info & IS_E0) |
161 | serio_interrupt(kbd_dev->hv_serio, | 161 | serio_interrupt(kbd_dev->hv_serio, |
162 | XTKBD_EMUL0, 0); | 162 | XTKBD_EMUL0, 0); |
163 | 163 | if (info & IS_E1) | |
164 | serio_interrupt(kbd_dev->hv_serio, | ||
165 | XTKBD_EMUL1, 0); | ||
164 | scan_code = __le16_to_cpu(ks_msg->make_code); | 166 | scan_code = __le16_to_cpu(ks_msg->make_code); |
165 | if (info & IS_BREAK) | 167 | if (info & IS_BREAK) |
166 | scan_code |= XTKBD_RELEASE; | 168 | scan_code |= XTKBD_RELEASE; |
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 07a8363f3c5c..75516996db20 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
19 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
20 | #include <linux/i8042.h> | 20 | #include <linux/i8042.h> |
21 | #include <linux/init.h> | ||
22 | #include <linux/libps2.h> | 21 | #include <linux/libps2.h> |
23 | 22 | ||
24 | #define DRIVER_DESC "PS/2 driver library" | 23 | #define DRIVER_DESC "PS/2 driver library" |
diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c index 51b1d40cc286..5d2fe7ece7ca 100644 --- a/drivers/input/serio/olpc_apsp.c +++ b/drivers/input/serio/olpc_apsp.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/init.h> | ||
20 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
21 | #include <linux/err.h> | 20 | #include <linux/err.h> |
22 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c index 76f83836fd5a..e862c6ea9d9e 100644 --- a/drivers/input/serio/pcips2.c +++ b/drivers/input/serio/pcips2.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/init.h> | ||
20 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
@@ -181,7 +180,6 @@ static void pcips2_remove(struct pci_dev *dev) | |||
181 | struct pcips2_data *ps2if = pci_get_drvdata(dev); | 180 | struct pcips2_data *ps2if = pci_get_drvdata(dev); |
182 | 181 | ||
183 | serio_unregister_port(ps2if->io); | 182 | serio_unregister_port(ps2if->io); |
184 | pci_set_drvdata(dev, NULL); | ||
185 | kfree(ps2if); | 183 | kfree(ps2if); |
186 | pci_release_regions(dev); | 184 | pci_release_regions(dev); |
187 | pci_disable_device(dev); | 185 | pci_disable_device(dev); |
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index 7a65a1bc5226..594256c38554 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c | |||
@@ -30,7 +30,6 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/init.h> | ||
34 | #include <linux/serio.h> | 33 | #include <linux/serio.h> |
35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
36 | #include <linux/err.h> | 35 | #include <linux/err.h> |
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index 567566ae0dae..e462e7791bb8 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
32 | #include <linux/init.h> | ||
33 | #include <linux/serio.h> | 32 | #include <linux/serio.h> |
34 | #include <linux/err.h> | 33 | #include <linux/err.h> |
35 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 59df2e7317a3..c9a02fe57576 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/poll.h> | 15 | #include <linux/poll.h> |
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/serio.h> | 17 | #include <linux/serio.h> |
18 | #include <linux/init.h> | ||
19 | #include <linux/major.h> | 18 | #include <linux/major.h> |
20 | #include <linux/device.h> | 19 | #include <linux/device.h> |
21 | #include <linux/miscdevice.h> | 20 | #include <linux/miscdevice.h> |
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index dfbcd872f95e..e6cf52ebad87 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/init.h> | ||
24 | #include <linux/list.h> | 23 | #include <linux/list.h> |
25 | #include <linux/io.h> | 24 | #include <linux/io.h> |
26 | #include <linux/of_address.h> | 25 | #include <linux/of_address.h> |