aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-04-27 02:43:03 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 11:25:00 -0400
commitcb8f3c7dea960c27fcc66830cdaab82b13f1b597 (patch)
tree680012e9306769505fc55ce706a6c533cf3d3ed3 /arch/arm/mach-pxa
parentcb432b358dced89bd2af86b3f783a0a99e489421 (diff)
[ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kconfig
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>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/Kconfig12
-rw-r--r--arch/arm/mach-pxa/include/mach/tosa.h2
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 352dc4f3820c..454cd5d5f105 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -643,6 +643,18 @@ config TOSA_BT
643 This is a simple driver that is able to control 643 This is a simple driver that is able to control
644 the state of built in bluetooth chip on tosa. 644 the state of built in bluetooth chip on tosa.
645 645
646config TOSA_USE_EXT_KEYCODES
647 bool "Tosa keyboard: use extended keycodes"
648 depends on MACH_TOSA
649 default n
650 help
651 Say Y here to enable the tosa keyboard driver to generate extended
652 (>= 127) keycodes. Be aware, that they can't be correctly interpreted
653 by either console keyboard driver or by Kdrive keybd driver.
654
655 Say Y only if you know, what you are doing!
656
657
646config PXA_HAVE_BOARD_IRQS 658config PXA_HAVE_BOARD_IRQS
647 bool 659 bool
648 660
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 4df2d38507dc..1bbd1f2e4beb 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -167,7 +167,7 @@
167 167
168#define TOSA_KEY_SYNC KEY_102ND /* ??? */ 168#define TOSA_KEY_SYNC KEY_102ND /* ??? */
169 169
170#ifndef CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES 170#ifndef CONFIG_TOSA_USE_EXT_KEYCODES
171#define TOSA_KEY_RECORD KEY_YEN 171#define TOSA_KEY_RECORD KEY_YEN
172#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA 172#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA
173#define TOSA_KEY_CANCEL KEY_ESC 173#define TOSA_KEY_CANCEL KEY_ESC