diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-04-27 09:52:16 +0530 |
|---|---|---|
| committer | Henrik Aberg <henrik.aberg@stericsson.com> | 2011-05-18 09:40:08 +0200 |
| commit | 07b1957db20e13f5e96ffdcb3861c9cda4ee8e99 (patch) | |
| tree | 3a8932ef7066d5f5def62a05ace56d444806b619 /arch | |
| parent | 5bc5459f810d9d63660f07a2b6ed721ca188c3b9 (diff) | |
u5500: don't have keypad handle AB5500 ONSWa key
This key is handled from the AB5500 ponkey driver, and so should be removed
from this table to avoid duplicate reports from the DB5500 keypad driver.
ST-Ericsson Linux next: -
ST-Ericsson ID: WP257121
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I5ce07dfe63bc81f775fa6d4c83cff4bd26cd8a35
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21668
Reviewed-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index a358efcde34..b50109e5db1 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -209,7 +209,10 @@ static const unsigned int u5500_keymap[] = { KEY(4, 3, KEY_BACK), KEY(5, 2, KEY_SEND), KEY(5, 3, KEY_HOME), +#ifndef CONFIG_INPUT_AB8500_PONKEY + /* AB5500 ONSWa is also hooked up to this key */ KEY(8, 0, KEY_END), +#endif KEY(8, 1, KEY_VOLUMEUP), KEY(8, 2, KEY_VOLUMEDOWN), }; |