diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-05 02:46:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-11 01:11:34 -0400 |
| commit | bd96f37895197563bc1d6d6f7c012b3ae7df1c45 (patch) | |
| tree | 5cf94f01fc14e84df2147cc04ecd4482b7cf08e2 /arch/arm | |
| parent | 7cac9cd935533e52e277c0c8799a8ba16c24f250 (diff) | |
Input: pxa27x_keypad - allow modifying keymap from userspace
Tested-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h index 63e8965ad85d..7b4eadc6df3a 100644 --- a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h +++ b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | 6 | ||
| 7 | #define MAX_MATRIX_KEY_ROWS (8) | 7 | #define MAX_MATRIX_KEY_ROWS (8) |
| 8 | #define MAX_MATRIX_KEY_COLS (8) | 8 | #define MAX_MATRIX_KEY_COLS (8) |
| 9 | #define MATRIX_ROW_SHIFT (3) | ||
| 10 | #define MAX_DIRECT_KEY_NUM (8) | ||
| 9 | 11 | ||
| 10 | /* pxa3xx keypad platform specific parameters | 12 | /* pxa3xx keypad platform specific parameters |
| 11 | * | 13 | * |
| @@ -34,7 +36,7 @@ struct pxa27x_keypad_platform_data { | |||
| 34 | 36 | ||
| 35 | /* direct keys */ | 37 | /* direct keys */ |
| 36 | int direct_key_num; | 38 | int direct_key_num; |
| 37 | unsigned int direct_key_map[8]; | 39 | unsigned int direct_key_map[MAX_DIRECT_KEY_NUM]; |
| 38 | 40 | ||
| 39 | /* rotary encoders 0 */ | 41 | /* rotary encoders 0 */ |
| 40 | int enable_rotary0; | 42 | int enable_rotary0; |