diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-29 03:00:52 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-29 03:30:09 -0400 |
commit | cb589529f74d69abc111887b45308f333f950ade (patch) | |
tree | 8837bc65fccde6354461f6a53a1680343fb1b23d | |
parent | da0d03fe6cecde837f113a8a587f5a872d0fade0 (diff) |
Input: arrange keyboards alphabetically
Hopefully it will reduce conflicts when merging patches.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/keyboard/Kconfig | 291 | ||||
-rw-r--r-- | drivers/input/keyboard/Makefile | 32 |
2 files changed, 161 insertions, 162 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 9d8f796c6745..d2df1030675a 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
@@ -12,6 +12,42 @@ menuconfig INPUT_KEYBOARD | |||
12 | 12 | ||
13 | if INPUT_KEYBOARD | 13 | if INPUT_KEYBOARD |
14 | 14 | ||
15 | config KEYBOARD_AAED2000 | ||
16 | tristate "AAED-2000 keyboard" | ||
17 | depends on MACH_AAED2000 | ||
18 | select INPUT_POLLDEV | ||
19 | default y | ||
20 | help | ||
21 | Say Y here to enable the keyboard on the Agilent AAED-2000 | ||
22 | development board. | ||
23 | |||
24 | To compile this driver as a module, choose M here: the | ||
25 | module will be called aaed2000_kbd. | ||
26 | |||
27 | config KEYBOARD_AMIGA | ||
28 | tristate "Amiga keyboard" | ||
29 | depends on AMIGA | ||
30 | help | ||
31 | Say Y here if you are running Linux on any AMIGA and have a keyboard | ||
32 | attached. | ||
33 | |||
34 | To compile this driver as a module, choose M here: the | ||
35 | module will be called amikbd. | ||
36 | |||
37 | config ATARI_KBD_CORE | ||
38 | bool | ||
39 | |||
40 | config KEYBOARD_ATARI | ||
41 | tristate "Atari keyboard" | ||
42 | depends on ATARI | ||
43 | select ATARI_KBD_CORE | ||
44 | help | ||
45 | Say Y here if you are running Linux on any Atari and have a keyboard | ||
46 | attached. | ||
47 | |||
48 | To compile this driver as a module, choose M here: the | ||
49 | module will be called atakbd. | ||
50 | |||
15 | config KEYBOARD_ATKBD | 51 | config KEYBOARD_ATKBD |
16 | tristate "AT keyboard" if EMBEDDED || !X86 | 52 | tristate "AT keyboard" if EMBEDDED || !X86 |
17 | default y | 53 | default y |
@@ -68,69 +104,14 @@ config KEYBOARD_ATKBD_RDI_KEYCODES | |||
68 | right-hand column will be interpreted as the key shown in the | 104 | right-hand column will be interpreted as the key shown in the |
69 | left-hand column. | 105 | left-hand column. |
70 | 106 | ||
71 | config KEYBOARD_SUNKBD | 107 | config KEYBOARD_BFIN |
72 | tristate "Sun Type 4 and Type 5 keyboard" | 108 | tristate "Blackfin BF54x keypad support" |
73 | select SERIO | 109 | depends on (BF54x && !BF544) |
74 | help | ||
75 | Say Y here if you want to use a Sun Type 4 or Type 5 keyboard, | ||
76 | connected either to the Sun keyboard connector or to an serial | ||
77 | (RS-232) port via a simple adapter. | ||
78 | |||
79 | To compile this driver as a module, choose M here: the | ||
80 | module will be called sunkbd. | ||
81 | |||
82 | config KEYBOARD_LKKBD | ||
83 | tristate "DECstation/VAXstation LK201/LK401 keyboard" | ||
84 | select SERIO | ||
85 | help | ||
86 | Say Y here if you want to use a LK201 or LK401 style serial | ||
87 | keyboard. This keyboard is also useable on PCs if you attach | ||
88 | it with the inputattach program. The connector pinout is | ||
89 | described within lkkbd.c. | ||
90 | |||
91 | To compile this driver as a module, choose M here: the | ||
92 | module will be called lkkbd. | ||
93 | |||
94 | config KEYBOARD_LOCOMO | ||
95 | tristate "LoCoMo Keyboard Support" | ||
96 | depends on SHARP_LOCOMO && INPUT_KEYBOARD | ||
97 | help | ||
98 | Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA | ||
99 | |||
100 | To compile this driver as a module, choose M here: the | ||
101 | module will be called locomokbd. | ||
102 | |||
103 | config KEYBOARD_XTKBD | ||
104 | tristate "XT keyboard" | ||
105 | select SERIO | ||
106 | help | ||
107 | Say Y here if you want to use the old IBM PC/XT keyboard (or | ||
108 | compatible) on your system. This is only possible with a | ||
109 | parallel port keyboard adapter, you cannot connect it to the | ||
110 | keyboard port on a PC that runs Linux. | ||
111 | |||
112 | To compile this driver as a module, choose M here: the | ||
113 | module will be called xtkbd. | ||
114 | |||
115 | config KEYBOARD_NEWTON | ||
116 | tristate "Newton keyboard" | ||
117 | select SERIO | ||
118 | help | ||
119 | Say Y here if you have a Newton keyboard on a serial port. | ||
120 | |||
121 | To compile this driver as a module, choose M here: the | ||
122 | module will be called newtonkbd. | ||
123 | |||
124 | config KEYBOARD_STOWAWAY | ||
125 | tristate "Stowaway keyboard" | ||
126 | select SERIO | ||
127 | help | 110 | help |
128 | Say Y here if you have a Stowaway keyboard on a serial port. | 111 | Say Y here if you want to use the BF54x keypad. |
129 | Stowaway compatible keyboards like Dicota Input-PDA keyboard | ||
130 | are also supported by this driver. | ||
131 | 112 | ||
132 | To compile this driver as a module, choose M here: the | 113 | To compile this driver as a module, choose M here: the |
133 | module will be called stowaway. | 114 | module will be called bf54x-keys. |
134 | 115 | ||
135 | config KEYBOARD_CORGI | 116 | config KEYBOARD_CORGI |
136 | tristate "Corgi keyboard" | 117 | tristate "Corgi keyboard" |
@@ -143,61 +124,41 @@ config KEYBOARD_CORGI | |||
143 | To compile this driver as a module, choose M here: the | 124 | To compile this driver as a module, choose M here: the |
144 | module will be called corgikbd. | 125 | module will be called corgikbd. |
145 | 126 | ||
146 | config KEYBOARD_SPITZ | 127 | config KEYBOARD_LKKBD |
147 | tristate "Spitz keyboard" | 128 | tristate "DECstation/VAXstation LK201/LK401 keyboard" |
148 | depends on PXA_SHARPSL | 129 | select SERIO |
149 | default y | ||
150 | help | 130 | help |
151 | Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000, | 131 | Say Y here if you want to use a LK201 or LK401 style serial |
152 | SL-C3000 and Sl-C3100 series of PDAs. | 132 | keyboard. This keyboard is also useable on PCs if you attach |
133 | it with the inputattach program. The connector pinout is | ||
134 | described within lkkbd.c. | ||
153 | 135 | ||
154 | To compile this driver as a module, choose M here: the | 136 | To compile this driver as a module, choose M here: the |
155 | module will be called spitzkbd. | 137 | module will be called lkkbd. |
156 | 138 | ||
157 | config KEYBOARD_TOSA | 139 | config KEYBOARD_EP93XX |
158 | tristate "Tosa keyboard" | 140 | tristate "EP93xx Matrix Keypad support" |
159 | depends on MACH_TOSA | 141 | depends on ARCH_EP93XX |
160 | default y | ||
161 | help | 142 | help |
162 | Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa) | 143 | Say Y here to enable the matrix keypad on the Cirrus EP93XX. |
163 | 144 | ||
164 | To compile this driver as a module, choose M here: the | 145 | To compile this driver as a module, choose M here: the |
165 | module will be called tosakbd. | 146 | module will be called ep93xx_keypad. |
166 | |||
167 | config KEYBOARD_TOSA_USE_EXT_KEYCODES | ||
168 | bool "Tosa keyboard: use extended keycodes" | ||
169 | depends on KEYBOARD_TOSA | ||
170 | default n | ||
171 | help | ||
172 | Say Y here to enable the tosa keyboard driver to generate extended | ||
173 | (>= 127) keycodes. Be aware, that they can't be correctly interpreted | ||
174 | by either console keyboard driver or by Kdrive keybd driver. | ||
175 | |||
176 | Say Y only if you know, what you are doing! | ||
177 | 147 | ||
178 | config KEYBOARD_AMIGA | 148 | config KEYBOARD_GPIO |
179 | tristate "Amiga keyboard" | 149 | tristate "GPIO Buttons" |
180 | depends on AMIGA | 150 | depends on GENERIC_GPIO |
181 | help | 151 | help |
182 | Say Y here if you are running Linux on any AMIGA and have a keyboard | 152 | This driver implements support for buttons connected |
183 | attached. | 153 | to GPIO pins of various CPUs (and some other chips). |
184 | |||
185 | To compile this driver as a module, choose M here: the | ||
186 | module will be called amikbd. | ||
187 | |||
188 | config ATARI_KBD_CORE | ||
189 | bool | ||
190 | 154 | ||
191 | config KEYBOARD_ATARI | 155 | Say Y here if your device has buttons connected |
192 | tristate "Atari keyboard" | 156 | directly to such GPIO pins. Your board-specific |
193 | depends on ATARI | 157 | setup logic must also provide a platform device, |
194 | select ATARI_KBD_CORE | 158 | with configuration data saying which GPIOs are used. |
195 | help | ||
196 | Say Y here if you are running Linux on any Atari and have a keyboard | ||
197 | attached. | ||
198 | 159 | ||
199 | To compile this driver as a module, choose M here: the | 160 | To compile this driver as a module, choose M here: the |
200 | module will be called atakbd. | 161 | module will be called gpio-keys. |
201 | 162 | ||
202 | config KEYBOARD_HIL_OLD | 163 | config KEYBOARD_HIL_OLD |
203 | tristate "HP HIL keyboard support (simple driver)" | 164 | tristate "HP HIL keyboard support (simple driver)" |
@@ -261,14 +222,33 @@ config KEYBOARD_LM8323 | |||
261 | To compile this driver as a module, choose M here: the | 222 | To compile this driver as a module, choose M here: the |
262 | module will be called lm8323. | 223 | module will be called lm8323. |
263 | 224 | ||
264 | config KEYBOARD_OMAP | 225 | config KEYBOARD_LOCOMO |
265 | tristate "TI OMAP keypad support" | 226 | tristate "LoCoMo Keyboard Support" |
266 | depends on (ARCH_OMAP1 || ARCH_OMAP2) | 227 | depends on SHARP_LOCOMO |
267 | help | 228 | help |
268 | Say Y here if you want to use the OMAP keypad. | 229 | Say Y here if you are running Linux on a Sharp Zaurus Collie or Poodle based PDA |
269 | 230 | ||
270 | To compile this driver as a module, choose M here: the | 231 | To compile this driver as a module, choose M here: the |
271 | module will be called omap-keypad. | 232 | module will be called locomokbd. |
233 | |||
234 | config KEYBOARD_MAPLE | ||
235 | tristate "Maple bus keyboard" | ||
236 | depends on SH_DREAMCAST && MAPLE | ||
237 | help | ||
238 | Say Y here if you have a Dreamcast console running Linux and have | ||
239 | a keyboard attached to its Maple bus. | ||
240 | |||
241 | To compile this driver as a module, choose M here: the | ||
242 | module will be called maple_keyb. | ||
243 | |||
244 | config KEYBOARD_NEWTON | ||
245 | tristate "Newton keyboard" | ||
246 | select SERIO | ||
247 | help | ||
248 | Say Y here if you have a Newton keyboard on a serial port. | ||
249 | |||
250 | To compile this driver as a module, choose M here: the | ||
251 | module will be called newtonkbd. | ||
272 | 252 | ||
273 | config KEYBOARD_PXA27x | 253 | config KEYBOARD_PXA27x |
274 | tristate "PXA27x/PXA3xx keypad support" | 254 | tristate "PXA27x/PXA3xx keypad support" |
@@ -288,51 +268,38 @@ config KEYBOARD_PXA930_ROTARY | |||
288 | To compile this driver as a module, choose M here: the | 268 | To compile this driver as a module, choose M here: the |
289 | module will be called pxa930_rotary. | 269 | module will be called pxa930_rotary. |
290 | 270 | ||
291 | config KEYBOARD_AAED2000 | 271 | config KEYBOARD_SPITZ |
292 | tristate "AAED-2000 keyboard" | 272 | tristate "Spitz keyboard" |
293 | depends on MACH_AAED2000 | 273 | depends on PXA_SHARPSL |
294 | select INPUT_POLLDEV | ||
295 | default y | 274 | default y |
296 | help | 275 | help |
297 | Say Y here to enable the keyboard on the Agilent AAED-2000 | 276 | Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000, |
298 | development board. | 277 | SL-C3000 and Sl-C3100 series of PDAs. |
299 | |||
300 | To compile this driver as a module, choose M here: the | ||
301 | module will be called aaed2000_kbd. | ||
302 | |||
303 | config KEYBOARD_GPIO | ||
304 | tristate "GPIO Buttons" | ||
305 | depends on GENERIC_GPIO | ||
306 | help | ||
307 | This driver implements support for buttons connected | ||
308 | to GPIO pins of various CPUs (and some other chips). | ||
309 | |||
310 | Say Y here if your device has buttons connected | ||
311 | directly to such GPIO pins. Your board-specific | ||
312 | setup logic must also provide a platform device, | ||
313 | with configuration data saying which GPIOs are used. | ||
314 | 278 | ||
315 | To compile this driver as a module, choose M here: the | 279 | To compile this driver as a module, choose M here: the |
316 | module will be called gpio-keys. | 280 | module will be called spitzkbd. |
317 | 281 | ||
318 | config KEYBOARD_MAPLE | 282 | config KEYBOARD_STOWAWAY |
319 | tristate "Maple bus keyboard" | 283 | tristate "Stowaway keyboard" |
320 | depends on SH_DREAMCAST && MAPLE | 284 | select SERIO |
321 | help | 285 | help |
322 | Say Y here if you have a Dreamcast console running Linux and have | 286 | Say Y here if you have a Stowaway keyboard on a serial port. |
323 | a keyboard attached to its Maple bus. | 287 | Stowaway compatible keyboards like Dicota Input-PDA keyboard |
288 | are also supported by this driver. | ||
324 | 289 | ||
325 | To compile this driver as a module, choose M here: the | 290 | To compile this driver as a module, choose M here: the |
326 | module will be called maple_keyb. | 291 | module will be called stowaway. |
327 | 292 | ||
328 | config KEYBOARD_BFIN | 293 | config KEYBOARD_SUNKBD |
329 | tristate "Blackfin BF54x keypad support" | 294 | tristate "Sun Type 4 and Type 5 keyboard" |
330 | depends on (BF54x && !BF544) | 295 | select SERIO |
331 | help | 296 | help |
332 | Say Y here if you want to use the BF54x keypad. | 297 | Say Y here if you want to use a Sun Type 4 or Type 5 keyboard, |
298 | connected either to the Sun keyboard connector or to an serial | ||
299 | (RS-232) port via a simple adapter. | ||
333 | 300 | ||
334 | To compile this driver as a module, choose M here: the | 301 | To compile this driver as a module, choose M here: the |
335 | module will be called bf54x-keys. | 302 | module will be called sunkbd. |
336 | 303 | ||
337 | config KEYBOARD_SH_KEYSC | 304 | config KEYBOARD_SH_KEYSC |
338 | tristate "SuperH KEYSC keypad support" | 305 | tristate "SuperH KEYSC keypad support" |
@@ -344,13 +311,45 @@ config KEYBOARD_SH_KEYSC | |||
344 | To compile this driver as a module, choose M here: the | 311 | To compile this driver as a module, choose M here: the |
345 | module will be called sh_keysc. | 312 | module will be called sh_keysc. |
346 | 313 | ||
347 | config KEYBOARD_EP93XX | 314 | config KEYBOARD_OMAP |
348 | tristate "EP93xx Matrix Keypad support" | 315 | tristate "TI OMAP keypad support" |
349 | depends on ARCH_EP93XX | 316 | depends on (ARCH_OMAP1 || ARCH_OMAP2) |
350 | help | 317 | help |
351 | Say Y here to enable the matrix keypad on the Cirrus EP93XX. | 318 | Say Y here if you want to use the OMAP keypad. |
352 | 319 | ||
353 | To compile this driver as a module, choose M here: the | 320 | To compile this driver as a module, choose M here: the |
354 | module will be called ep93xx_keypad. | 321 | module will be called omap-keypad. |
322 | |||
323 | config KEYBOARD_TOSA | ||
324 | tristate "Tosa keyboard" | ||
325 | depends on MACH_TOSA | ||
326 | default y | ||
327 | help | ||
328 | Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa) | ||
329 | |||
330 | To compile this driver as a module, choose M here: the | ||
331 | module will be called tosakbd. | ||
332 | |||
333 | config KEYBOARD_TOSA_USE_EXT_KEYCODES | ||
334 | bool "Tosa keyboard: use extended keycodes" | ||
335 | depends on KEYBOARD_TOSA | ||
336 | help | ||
337 | Say Y here to enable the tosa keyboard driver to generate extended | ||
338 | (>= 127) keycodes. Be aware, that they can't be correctly interpreted | ||
339 | by either console keyboard driver or by Kdrive keybd driver. | ||
340 | |||
341 | Say Y only if you know, what you are doing! | ||
342 | |||
343 | config KEYBOARD_XTKBD | ||
344 | tristate "XT keyboard" | ||
345 | select SERIO | ||
346 | help | ||
347 | Say Y here if you want to use the old IBM PC/XT keyboard (or | ||
348 | compatible) on your system. This is only possible with a | ||
349 | parallel port keyboard adapter, you cannot connect it to the | ||
350 | keyboard port on a PC that runs Linux. | ||
351 | |||
352 | To compile this driver as a module, choose M here: the | ||
353 | module will be called xtkbd. | ||
355 | 354 | ||
356 | endif | 355 | endif |
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 156b647a259b..632efbc18c44 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile | |||
@@ -4,29 +4,29 @@ | |||
4 | 4 | ||
5 | # Each configuration option enables a list of files. | 5 | # Each configuration option enables a list of files. |
6 | 6 | ||
7 | obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o | 7 | obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o |
8 | obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o | ||
9 | obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o | ||
10 | obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o | ||
11 | obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o | 8 | obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o |
12 | obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o | 9 | obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o |
13 | obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o | 10 | obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o |
14 | obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o | 11 | obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o |
15 | obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o | ||
16 | obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o | 12 | obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o |
17 | obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o | 13 | obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o |
18 | obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o | 14 | obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o |
19 | obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o | 15 | obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o |
20 | obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o | 16 | obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o |
17 | obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o | ||
18 | obj-$(CONFIG_KEYBOARD_HP7XX) += jornada720_kbd.o | ||
19 | obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o | ||
21 | obj-$(CONFIG_KEYBOARD_LM8323) += lm8323.o | 20 | obj-$(CONFIG_KEYBOARD_LM8323) += lm8323.o |
21 | obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o | ||
22 | obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o | ||
23 | obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o | ||
22 | obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o | 24 | obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o |
23 | obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o | 25 | obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o |
24 | obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o | 26 | obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o |
25 | obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o | ||
26 | obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o | ||
27 | obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o | ||
28 | obj-$(CONFIG_KEYBOARD_HP7XX) += jornada720_kbd.o | ||
29 | obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o | ||
30 | obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o | ||
31 | obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o | 27 | obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o |
32 | obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o | 28 | obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o |
29 | obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o | ||
30 | obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o | ||
31 | obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o | ||
32 | obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o | ||