aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-13 17:09:39 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-13 17:09:39 -0400
commiteedab661a51966c454e38c17266a531aa58b4a98 (patch)
tree1f185821f45cccb2ecc91ae0303eda201eb83212 /drivers
parentc3bff2ec10b8bf2f53c954e370f9bdae93064472 (diff)
parent893e7c2db05f14032f2390ef7c59a499fc25ccae (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: move input-polldev to drivers/input Input: i8042 - add ULI EV4873 to noloop list Input: i8042 - add ASUS P65UP5 to the noloop list Input: usbtouchscreen - fix fallout caused by move from drivers/usb
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/Kconfig13
-rw-r--r--drivers/input/Makefile1
-rw-r--r--drivers/input/input-polldev.c (renamed from drivers/input/misc/input-polldev.c)0
-rw-r--r--drivers/input/misc/Kconfig11
-rw-r--r--drivers/input/misc/Makefile1
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h18
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c44
7 files changed, 54 insertions, 34 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index f814fb3a469d..2d87357e2b2b 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -39,6 +39,19 @@ config INPUT_FF_MEMLESS
39 To compile this driver as a module, choose M here: the 39 To compile this driver as a module, choose M here: the
40 module will be called ff-memless. 40 module will be called ff-memless.
41 41
42config INPUT_POLLDEV
43 tristate "Polled input device skeleton"
44 help
45 Say Y here if you are using a driver for an input
46 device that periodically polls hardware state. This
47 option is only useful for out-of-tree drivers since
48 in-tree drivers select it automatically.
49
50 If unsure, say N.
51
52 To compile this driver as a module, choose M here: the
53 module will be called input-polldev.
54
42comment "Userland interfaces" 55comment "Userland interfaces"
43 56
44config INPUT_MOUSEDEV 57config INPUT_MOUSEDEV
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 8a2dd987546c..15eb752697b3 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_INPUT) += input-core.o
8input-core-objs := input.o ff-core.o 8input-core-objs := input.o ff-core.o
9 9
10obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o 10obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o
11obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o
11 12
12obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o 13obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o
13obj-$(CONFIG_INPUT_JOYDEV) += joydev.o 14obj-$(CONFIG_INPUT_JOYDEV) += joydev.o
diff --git a/drivers/input/misc/input-polldev.c b/drivers/input/input-polldev.c
index b773d4c756a6..b773d4c756a6 100644
--- a/drivers/input/misc/input-polldev.c
+++ b/drivers/input/input-polldev.c
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 842a7b4d16f8..88e29074ac90 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -170,17 +170,6 @@ config INPUT_UINPUT
170 To compile this driver as a module, choose M here: the 170 To compile this driver as a module, choose M here: the
171 module will be called uinput. 171 module will be called uinput.
172 172
173config INPUT_POLLDEV
174 tristate "Polled input device skeleton"
175 help
176 Say Y here if you are using a driver for an input
177 device that periodically polls hardware state. This
178 option is only useful for out-of-tree drivers since
179 in-tree drivers select it automatically.
180
181 To compile this driver as a module, choose M here: the
182 module will be called input-polldev.
183
184config HP_SDC_RTC 173config HP_SDC_RTC
185 tristate "HP SDC Real Time Clock" 174 tristate "HP SDC Real Time Clock"
186 depends on GSC || HP300 175 depends on GSC || HP300
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 8b2f7799e25c..3585b5038418 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -4,7 +4,6 @@
4 4
5# Each configuration option enables a list of files. 5# Each configuration option enables a list of files.
6 6
7obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o
8obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o 7obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o
9obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o 8obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o
10obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o 9obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 6858bc58f0fd..f4a2517925e4 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -69,6 +69,15 @@ static inline void i8042_write_command(int val)
69 69
70static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = { 70static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
71 { 71 {
72 /* AUX LOOP command does not raise AUX IRQ */
73 .ident = "ASUS P65UP5",
74 .matches = {
75 DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
76 DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"),
77 DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"),
78 },
79 },
80 {
72 .ident = "Compaq Proliant 8500", 81 .ident = "Compaq Proliant 8500",
73 .matches = { 82 .matches = {
74 DMI_MATCH(DMI_SYS_VENDOR, "Compaq"), 83 DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
@@ -92,6 +101,15 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
92 DMI_MATCH(DMI_PRODUCT_VERSION, "00"), 101 DMI_MATCH(DMI_PRODUCT_VERSION, "00"),
93 }, 102 },
94 }, 103 },
104 {
105 /* AUX LOOP does not work properly */
106 .ident = "ULI EV4873",
107 .matches = {
108 DMI_MATCH(DMI_SYS_VENDOR, "ULI"),
109 DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"),
110 DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
111 },
112 },
95 { } 113 { }
96}; 114};
97 115
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 8e18e6c64777..e3f22852bd09 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -91,7 +91,7 @@ struct usbtouch_usb {
91}; 91};
92 92
93 93
94#if defined(CONFIG_USB_TOUCHSCREEN_EGALAX) || defined(CONFIG_USB_TOUCHSCREEN_ETURBO) 94#if defined(CONFIG_TOUCHSCREEN_USB_EGALAX) || defined(CONFIG_TOUCHSCREEN_USB_ETURBO)
95#define MULTI_PACKET 95#define MULTI_PACKET
96#endif 96#endif
97 97
@@ -113,7 +113,7 @@ enum {
113}; 113};
114 114
115static struct usb_device_id usbtouch_devices[] = { 115static struct usb_device_id usbtouch_devices[] = {
116#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX 116#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
117 {USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX}, 117 {USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX},
118 {USB_DEVICE(0x3823, 0x0002), .driver_info = DEVTYPE_EGALAX}, 118 {USB_DEVICE(0x3823, 0x0002), .driver_info = DEVTYPE_EGALAX},
119 {USB_DEVICE(0x0123, 0x0001), .driver_info = DEVTYPE_EGALAX}, 119 {USB_DEVICE(0x0123, 0x0001), .driver_info = DEVTYPE_EGALAX},
@@ -123,30 +123,30 @@ static struct usb_device_id usbtouch_devices[] = {
123 {USB_DEVICE(0x1234, 0x0002), .driver_info = DEVTYPE_EGALAX}, 123 {USB_DEVICE(0x1234, 0x0002), .driver_info = DEVTYPE_EGALAX},
124#endif 124#endif
125 125
126#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT 126#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
127 {USB_DEVICE(0x134c, 0x0001), .driver_info = DEVTYPE_PANJIT}, 127 {USB_DEVICE(0x134c, 0x0001), .driver_info = DEVTYPE_PANJIT},
128 {USB_DEVICE(0x134c, 0x0002), .driver_info = DEVTYPE_PANJIT}, 128 {USB_DEVICE(0x134c, 0x0002), .driver_info = DEVTYPE_PANJIT},
129 {USB_DEVICE(0x134c, 0x0003), .driver_info = DEVTYPE_PANJIT}, 129 {USB_DEVICE(0x134c, 0x0003), .driver_info = DEVTYPE_PANJIT},
130 {USB_DEVICE(0x134c, 0x0004), .driver_info = DEVTYPE_PANJIT}, 130 {USB_DEVICE(0x134c, 0x0004), .driver_info = DEVTYPE_PANJIT},
131#endif 131#endif
132 132
133#ifdef CONFIG_USB_TOUCHSCREEN_3M 133#ifdef CONFIG_TOUCHSCREEN_USB_3M
134 {USB_DEVICE(0x0596, 0x0001), .driver_info = DEVTYPE_3M}, 134 {USB_DEVICE(0x0596, 0x0001), .driver_info = DEVTYPE_3M},
135#endif 135#endif
136 136
137#ifdef CONFIG_USB_TOUCHSCREEN_ITM 137#ifdef CONFIG_TOUCHSCREEN_USB_ITM
138 {USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM}, 138 {USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM},
139#endif 139#endif
140 140
141#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO 141#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
142 {USB_DEVICE(0x1234, 0x5678), .driver_info = DEVTYPE_ETURBO}, 142 {USB_DEVICE(0x1234, 0x5678), .driver_info = DEVTYPE_ETURBO},
143#endif 143#endif
144 144
145#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE 145#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
146 {USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE}, 146 {USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE},
147#endif 147#endif
148 148
149#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10 149#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
150 {USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10}, 150 {USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10},
151#endif 151#endif
152 152
@@ -158,7 +158,7 @@ static struct usb_device_id usbtouch_devices[] = {
158 * eGalax part 158 * eGalax part
159 */ 159 */
160 160
161#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX 161#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
162 162
163#define EGALAX_PKT_TYPE_MASK 0xFE 163#define EGALAX_PKT_TYPE_MASK 0xFE
164#define EGALAX_PKT_TYPE_REPT 0x80 164#define EGALAX_PKT_TYPE_REPT 0x80
@@ -197,7 +197,7 @@ static int egalax_get_pkt_len(unsigned char *buf, int len)
197/***************************************************************************** 197/*****************************************************************************
198 * PanJit Part 198 * PanJit Part
199 */ 199 */
200#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT 200#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
201static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt) 201static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
202{ 202{
203 dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1]; 203 dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
@@ -212,7 +212,7 @@ static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
212/***************************************************************************** 212/*****************************************************************************
213 * 3M/Microtouch Part 213 * 3M/Microtouch Part
214 */ 214 */
215#ifdef CONFIG_USB_TOUCHSCREEN_3M 215#ifdef CONFIG_TOUCHSCREEN_USB_3M
216 216
217#define MTOUCHUSB_ASYNC_REPORT 1 217#define MTOUCHUSB_ASYNC_REPORT 1
218#define MTOUCHUSB_RESET 7 218#define MTOUCHUSB_RESET 7
@@ -262,7 +262,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
262/***************************************************************************** 262/*****************************************************************************
263 * ITM Part 263 * ITM Part
264 */ 264 */
265#ifdef CONFIG_USB_TOUCHSCREEN_ITM 265#ifdef CONFIG_TOUCHSCREEN_USB_ITM
266static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt) 266static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
267{ 267{
268 int touch; 268 int touch;
@@ -296,7 +296,7 @@ static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
296/***************************************************************************** 296/*****************************************************************************
297 * eTurboTouch part 297 * eTurboTouch part
298 */ 298 */
299#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO 299#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
300static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt) 300static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
301{ 301{
302 unsigned int shift; 302 unsigned int shift;
@@ -327,7 +327,7 @@ static int eturbo_get_pkt_len(unsigned char *buf, int len)
327/***************************************************************************** 327/*****************************************************************************
328 * Gunze part 328 * Gunze part
329 */ 329 */
330#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE 330#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
331static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt) 331static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
332{ 332{
333 if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80)) 333 if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80))
@@ -348,7 +348,7 @@ static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
348 * http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf 348 * http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf
349 * http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf 349 * http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf
350 */ 350 */
351#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10 351#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
352 352
353/* supported data rates. currently using 130 */ 353/* supported data rates. currently using 130 */
354#define TSC10_RATE_POINT 0x50 354#define TSC10_RATE_POINT 0x50
@@ -419,7 +419,7 @@ static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
419 * the different device descriptors 419 * the different device descriptors
420 */ 420 */
421static struct usbtouch_device_info usbtouch_dev_info[] = { 421static struct usbtouch_device_info usbtouch_dev_info[] = {
422#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX 422#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
423 [DEVTYPE_EGALAX] = { 423 [DEVTYPE_EGALAX] = {
424 .min_xc = 0x0, 424 .min_xc = 0x0,
425 .max_xc = 0x07ff, 425 .max_xc = 0x07ff,
@@ -433,7 +433,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
433 }, 433 },
434#endif 434#endif
435 435
436#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT 436#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
437 [DEVTYPE_PANJIT] = { 437 [DEVTYPE_PANJIT] = {
438 .min_xc = 0x0, 438 .min_xc = 0x0,
439 .max_xc = 0x0fff, 439 .max_xc = 0x0fff,
@@ -444,7 +444,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
444 }, 444 },
445#endif 445#endif
446 446
447#ifdef CONFIG_USB_TOUCHSCREEN_3M 447#ifdef CONFIG_TOUCHSCREEN_USB_3M
448 [DEVTYPE_3M] = { 448 [DEVTYPE_3M] = {
449 .min_xc = 0x0, 449 .min_xc = 0x0,
450 .max_xc = 0x4000, 450 .max_xc = 0x4000,
@@ -456,7 +456,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
456 }, 456 },
457#endif 457#endif
458 458
459#ifdef CONFIG_USB_TOUCHSCREEN_ITM 459#ifdef CONFIG_TOUCHSCREEN_USB_ITM
460 [DEVTYPE_ITM] = { 460 [DEVTYPE_ITM] = {
461 .min_xc = 0x0, 461 .min_xc = 0x0,
462 .max_xc = 0x0fff, 462 .max_xc = 0x0fff,
@@ -468,7 +468,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
468 }, 468 },
469#endif 469#endif
470 470
471#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO 471#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
472 [DEVTYPE_ETURBO] = { 472 [DEVTYPE_ETURBO] = {
473 .min_xc = 0x0, 473 .min_xc = 0x0,
474 .max_xc = 0x07ff, 474 .max_xc = 0x07ff,
@@ -482,7 +482,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
482 }, 482 },
483#endif 483#endif
484 484
485#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE 485#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
486 [DEVTYPE_GUNZE] = { 486 [DEVTYPE_GUNZE] = {
487 .min_xc = 0x0, 487 .min_xc = 0x0,
488 .max_xc = 0x0fff, 488 .max_xc = 0x0fff,
@@ -493,7 +493,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
493 }, 493 },
494#endif 494#endif
495 495
496#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10 496#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
497 [DEVTYPE_DMC_TSC10] = { 497 [DEVTYPE_DMC_TSC10] = {
498 .min_xc = 0x0, 498 .min_xc = 0x0,
499 .max_xc = 0x03ff, 499 .max_xc = 0x03ff,