diff options
| author | Chris Blair <chris.blair@stericsson.com> | 2011-12-05 10:01:21 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:39 +0200 |
| commit | dec331e62c2d978ebf73b9f0f04b53ace3c24907 (patch) | |
| tree | 0bc05a64ddfe00c92504c1caa7f48d43ccf910ea /arch/arm/plat-nomadik | |
| parent | 961a50cea677e23992aa0fc49ed33f50779ea328 (diff) | |
Nomadik ske: Support keypad smaller than 8x8
Adds support to the driver for keypads with less than 8 rows
and 8 columns.
ST-Ericsson ID: 373774
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Signed-off-by: Chris Blair <chris.blair@stericsson.com>
Conflicts:
drivers/input/keyboard/nomadik-ske-keypad.c
Change-Id: Ib357ed6247c82dd326ce00fe826777fd459088b4
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/46286
Reviewed-by: QATOOLS
Reviewed-by: Michel JAOUEN <michel.jaouen@stericsson.com>
Tested-by: Michel JAOUEN <michel.jaouen@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com>
Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/plat-nomadik')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/ske.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ske.h b/arch/arm/plat-nomadik/include/plat/ske.h index 7a4fbdf3c13..834c015c935 100644 --- a/arch/arm/plat-nomadik/include/plat/ske.h +++ b/arch/arm/plat-nomadik/include/plat/ske.h @@ -38,6 +38,8 @@ * @keymap_data: matrix scan code table for keycodes * @krow: maximum number of rows * @kcol: maximum number of columns + * @kconnected_rows: number of rows actually connected + * @kconnected_cols: number of columns actually connected * @debounce_ms: platform specific debounce time * @no_autorepeat: flag for auto repetition * @wakeup_enable: allow waking up the system @@ -51,6 +53,8 @@ struct ske_keypad_platform_data { const struct matrix_keymap_data *keymap_data; u8 krow; u8 kcol; + u8 kconnected_rows; + u8 kconnected_cols; u8 debounce_ms; bool no_autorepeat; bool wakeup_enable; |