lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kconfig

Browse Source 
Tosa is now able to use generic matrix keypad driver instead of the deprecated
tosakbd.c, where CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is still useful.  Move
it to mach/Kconfig.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Eric Miao
2010-04-27 14:43:03 +08:00
parent cb432b358d
commit cb8f3c7dea
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-pxa/Kconfig
View File

@@ -643,6 +643,18 @@ config TOSA_BT
This is a simple driver that is able to control This is a simple driver that is able to control
the state of built in bluetooth chip on tosa. the state of built in bluetooth chip on tosa.
config TOSA_USE_EXT_KEYCODES
bool "Tosa keyboard: use extended keycodes"
depends on MACH_TOSA
default n
help
Say Y here to enable the tosa keyboard driver to generate extended
(>= 127) keycodes. Be aware, that they can't be correctly interpreted
by either console keyboard driver or by Kdrive keybd driver.
Say Y only if you know, what you are doing!
config PXA_HAVE_BOARD_IRQS config PXA_HAVE_BOARD_IRQS
bool bool

2
arch/arm/mach-pxa/include/mach/tosa.h
View File

@@ -167,7 +167,7 @@
#define TOSA_KEY_SYNC KEY_102ND /* ??? */ #define TOSA_KEY_SYNC KEY_102ND /* ??? */
#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES #ifndef CONFIG_TOSA_USE_EXT_KEYCODES
#define TOSA_KEY_RECORD KEY_YEN #define TOSA_KEY_RECORD KEY_YEN
#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA #define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA
#define TOSA_KEY_CANCEL KEY_ESC #define TOSA_KEY_CANCEL KEY_ESC

10
drivers/input/keyboard/Kconfig
View File

@@ -426,16 +426,6 @@ config KEYBOARD_TOSA
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called tosakbd. module will be called tosakbd.
config KEYBOARD_TOSA_USE_EXT_KEYCODES
bool "Tosa keyboard: use extended keycodes"
depends on KEYBOARD_TOSA
help
Say Y here to enable the tosa keyboard driver to generate extended
(>= 127) keycodes. Be aware, that they can't be correctly interpreted
by either console keyboard driver or by Kdrive keybd driver.
Say Y only if you know, what you are doing!
config KEYBOARD_XTKBD config KEYBOARD_XTKBD
tristate "XT keyboard" tristate "XT keyboard"
select SERIO select SERIO