diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-05-04 02:29:58 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-04 02:32:22 -0400 |
| commit | 16b32e0c9eec1bb8d53deedcd9f4704a114d84bb (patch) | |
| tree | 0566941ba44ed37b3f3e2c0e313887448d5b2f2f /drivers/input/keyboard | |
| parent | f3192090df1e17dbd0f7c4b3820d31719422eb96 (diff) | |
Input: remove obsolete {corgi,spitz,tosa}kbd.c
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 48 | ||||
| -rw-r--r-- | drivers/input/keyboard/Makefile | 3 | ||||
| -rw-r--r-- | drivers/input/keyboard/corgikbd.c | 414 | ||||
| -rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 496 | ||||
| -rw-r--r-- | drivers/input/keyboard/tosakbd.c | 431 |
5 files changed, 0 insertions, 1392 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 64c102355f53..a8293388d019 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -143,19 +143,6 @@ config KEYBOARD_BFIN | |||
| 143 | To compile this driver as a module, choose M here: the | 143 | To compile this driver as a module, choose M here: the |
| 144 | module will be called bf54x-keys. | 144 | module will be called bf54x-keys. |
| 145 | 145 | ||
| 146 | config KEYBOARD_CORGI | ||
| 147 | tristate "Corgi keyboard (deprecated)" | ||
| 148 | depends on PXA_SHARPSL | ||
| 149 | help | ||
| 150 | Say Y here to enable the keyboard on the Sharp Zaurus SL-C7xx | ||
| 151 | series of PDAs. | ||
| 152 | |||
| 153 | This driver is now deprecated, use generic GPIO based matrix | ||
| 154 | keyboard driver instead. | ||
| 155 | |||
| 156 | To compile this driver as a module, choose M here: the | ||
| 157 | module will be called corgikbd. | ||
| 158 | |||
| 159 | config KEYBOARD_LKKBD | 146 | config KEYBOARD_LKKBD |
| 160 | tristate "DECstation/VAXstation LK201/LK401 keyboard" | 147 | tristate "DECstation/VAXstation LK201/LK401 keyboard" |
| 161 | select SERIO | 148 | select SERIO |
| @@ -339,19 +326,6 @@ config KEYBOARD_PXA930_ROTARY | |||
| 339 | To compile this driver as a module, choose M here: the | 326 | To compile this driver as a module, choose M here: the |
| 340 | module will be called pxa930_rotary. | 327 | module will be called pxa930_rotary. |
| 341 | 328 | ||
| 342 | config KEYBOARD_SPITZ | ||
| 343 | tristate "Spitz keyboard (deprecated)" | ||
| 344 | depends on PXA_SHARPSL | ||
| 345 | help | ||
| 346 | Say Y here to enable the keyboard on the Sharp Zaurus SL-C1000, | ||
| 347 | SL-C3000 and Sl-C3100 series of PDAs. | ||
| 348 | |||
| 349 | This driver is now deprecated, use generic GPIO based matrix | ||
| 350 | keyboard driver instead. | ||
| 351 | |||
| 352 | To compile this driver as a module, choose M here: the | ||
| 353 | module will be called spitzkbd. | ||
| 354 | |||
| 355 | config KEYBOARD_STOWAWAY | 329 | config KEYBOARD_STOWAWAY |
| 356 | tristate "Stowaway keyboard" | 330 | tristate "Stowaway keyboard" |
| 357 | select SERIO | 331 | select SERIO |
| @@ -414,28 +388,6 @@ config KEYBOARD_TWL4030 | |||
| 414 | To compile this driver as a module, choose M here: the | 388 | To compile this driver as a module, choose M here: the |
| 415 | module will be called twl4030_keypad. | 389 | module will be called twl4030_keypad. |
| 416 | 390 | ||
| 417 | config KEYBOARD_TOSA | ||
| 418 | tristate "Tosa keyboard (deprecated)" | ||
| 419 | depends on MACH_TOSA | ||
| 420 | help | ||
| 421 | Say Y here to enable the keyboard on the Sharp Zaurus SL-6000x (Tosa) | ||
| 422 | |||
| 423 | This driver is now deprecated, use generic GPIO based matrix | ||
| 424 | keyboard driver instead. | ||
| 425 | |||
| 426 | To compile this driver as a module, choose M here: the | ||
| 427 | module will be called tosakbd. | ||
| 428 | |||
| 429 | config KEYBOARD_TOSA_USE_EXT_KEYCODES | ||
| 430 | bool "Tosa keyboard: use extended keycodes" | ||
| 431 | depends on KEYBOARD_TOSA | ||
| 432 | help | ||
| 433 | Say Y here to enable the tosa keyboard driver to generate extended | ||
| 434 | (>= 127) keycodes. Be aware, that they can't be correctly interpreted | ||
| 435 | by either console keyboard driver or by Kdrive keybd driver. | ||
| 436 | |||
| 437 | Say Y only if you know, what you are doing! | ||
| 438 | |||
| 439 | config KEYBOARD_XTKBD | 391 | config KEYBOARD_XTKBD |
| 440 | tristate "XT keyboard" | 392 | tristate "XT keyboard" |
| 441 | select SERIO | 393 | select SERIO |
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 706c6b5ed5f4..9a74127e4d17 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile | |||
| @@ -11,7 +11,6 @@ obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o | |||
| 11 | obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o | 11 | obj-$(CONFIG_KEYBOARD_ATARI) += atakbd.o |
| 12 | obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o | 12 | obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o |
| 13 | obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o | 13 | obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o |
| 14 | obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o | ||
| 15 | obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o | 14 | obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o |
| 16 | obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o | 15 | obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o |
| 17 | obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o | 16 | obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o |
| @@ -33,10 +32,8 @@ obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o | |||
| 33 | obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o | 32 | obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o |
| 34 | obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o | 33 | obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o |
| 35 | obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o | 34 | obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o |
| 36 | obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o | ||
| 37 | obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o | 35 | obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o |
| 38 | obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o | 36 | obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o |
| 39 | obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o | ||
| 40 | obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o | 37 | obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o |
| 41 | obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o | 38 | obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o |
| 42 | obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o | 39 | obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o |
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c deleted file mode 100644 index 634af6a8e6b3..000000000000 --- a/drivers/input/keyboard/corgikbd.c +++ /dev/null | |||
| @@ -1,414 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Keyboard driver for Sharp Corgi models (SL-C7xx) | ||
| 3 | * | ||
| 4 | * Copyright (c) 2004-2005 Richard Purdie | ||
| 5 | * | ||
| 6 | * Based on xtkbd.c/locomkbd.c | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/delay.h> | ||
| 15 | #include <linux/platform_device.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/input.h> | ||
| 18 | #include <linux/interrupt.h> | ||
| 19 | #include <linux/jiffies.h> | ||
| 20 | #include <linux/module.h> | ||
| 21 | #include <linux/slab.h> | ||
| 22 | |||
| 23 | #include <mach/corgi.h> | ||
| 24 | #include <mach/pxa2xx-gpio.h> | ||
| 25 | #include <asm/hardware/scoop.h> | ||
| 26 | |||
| 27 | #define KB_ROWS 8 | ||
| 28 | #define KB_COLS 12 | ||
| 29 | #define KB_ROWMASK(r) (1 << (r)) | ||
| 30 | #define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 ) | ||
| 31 | /* zero code, 124 scancodes */ | ||
| 32 | #define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 ) | ||
| 33 | |||
| 34 | #define SCAN_INTERVAL (50) /* ms */ | ||
| 35 | #define HINGE_SCAN_INTERVAL (250) /* ms */ | ||
| 36 | |||
| 37 | #define CORGI_KEY_CALENDER KEY_F1 | ||
| 38 | #define CORGI_KEY_ADDRESS KEY_F2 | ||
| 39 | #define CORGI_KEY_FN KEY_F3 | ||
| 40 | #define CORGI_KEY_CANCEL KEY_F4 | ||
| 41 | #define CORGI_KEY_OFF KEY_SUSPEND | ||
| 42 | #define CORGI_KEY_EXOK KEY_F5 | ||
| 43 | #define CORGI_KEY_EXCANCEL KEY_F6 | ||
| 44 | #define CORGI_KEY_EXJOGDOWN KEY_F7 | ||
| 45 | #define CORGI_KEY_EXJOGUP KEY_F8 | ||
| 46 | #define CORGI_KEY_JAP1 KEY_LEFTCTRL | ||
| 47 | #define CORGI_KEY_JAP2 KEY_LEFTALT | ||
| 48 | #define CORGI_KEY_MAIL KEY_F10 | ||
| 49 | #define CORGI_KEY_OK KEY_F11 | ||
| 50 | #define CORGI_KEY_MENU KEY_F12 | ||
| 51 | |||
| 52 | static unsigned char corgikbd_keycode[NR_SCANCODES] = { | ||
| 53 | 0, /* 0 */ | ||
| 54 | 0, KEY_1, KEY_3, KEY_5, KEY_6, KEY_7, KEY_9, KEY_0, KEY_BACKSPACE, 0, 0, 0, 0, 0, 0, 0, /* 1-16 */ | ||
| 55 | 0, KEY_2, KEY_4, KEY_R, KEY_Y, KEY_8, KEY_I, KEY_O, KEY_P, 0, 0, 0, 0, 0, 0, 0, /* 17-32 */ | ||
| 56 | KEY_TAB, KEY_Q, KEY_E, KEY_T, KEY_G, KEY_U, KEY_J, KEY_K, 0, 0, 0, 0, 0, 0, 0, 0, /* 33-48 */ | ||
| 57 | CORGI_KEY_CALENDER, KEY_W, KEY_S, KEY_F, KEY_V, KEY_H, KEY_M, KEY_L, 0, KEY_RIGHTSHIFT, 0, 0, 0, 0, 0, 0, /* 49-64 */ | ||
| 58 | CORGI_KEY_ADDRESS, KEY_A, KEY_D, KEY_C, KEY_B, KEY_N, KEY_DOT, 0, KEY_ENTER, 0, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, /* 65-80 */ | ||
| 59 | CORGI_KEY_MAIL, KEY_Z, KEY_X, KEY_MINUS, KEY_SPACE, KEY_COMMA, 0, KEY_UP, 0, 0, 0, CORGI_KEY_FN, 0, 0, 0, 0, /* 81-96 */ | ||
| 60 | KEY_SYSRQ, CORGI_KEY_JAP1, CORGI_KEY_JAP2, CORGI_KEY_CANCEL, CORGI_KEY_OK, CORGI_KEY_MENU, KEY_LEFT, KEY_DOWN, KEY_RIGHT, 0, 0, 0, 0, 0, 0, 0, /* 97-112 */ | ||
| 61 | CORGI_KEY_OFF, CORGI_KEY_EXOK, CORGI_KEY_EXCANCEL, CORGI_KEY_EXJOGDOWN, CORGI_KEY_EXJOGUP, 0, 0, 0, 0, 0, 0, 0, /* 113-124 */ | ||
| 62 | }; | ||
| 63 | |||
| 64 | |||
| 65 | struct corgikbd { | ||
| 66 | unsigned char keycode[ARRAY_SIZE(corgikbd_keycode)]; | ||
| 67 | struct input_dev *input; | ||
| 68 | |||
| 69 | spinlock_t lock; | ||
| 70 | struct timer_list timer; | ||
| 71 | struct timer_list htimer; | ||
