omap: pandora: fix keypad keymap
Subsystems (3)
PATCH 1/1 omap: pandora: fix keypad keymap
The original TWL4030 keypad driver from linux-omap used KEY() macro defined as (col, row), but while it was merged upstream it was changed to use matrix keypad infrastructure, which uses (row, col) format. Update the keymap in board file to match layout of mainline driver.
--- arch/arm/mach-omap2/board-omap3pandora.c | 78 +++++++++++++++--------------- 1 files changed, 39 insertions(+), 39 deletions(-)
arch/arm/mach-omap2/board-omap3pandora.c +39 -39
@@ -134,50 +134,50 @@ static void __init pandora_keys_gpio_init(void) }static int board_keymap[] = { -/* col, row, code */ +/* row, col, code */ KEY (0 ,0 ,KEY_9 ), -KEY (0 ,1 ,KEY_0 ), -KEY (0 ,2 ,KEY_BACKSPACE ), -KEY (0 ,3 ,KEY_O ), -KEY (0 ,4 ,KEY_P ), -KEY (0 ,5 ,KEY_K ), -KEY (0 ,6 ,KEY_L ), -KEY (0 ,7 ,KEY_ENTER ), -KEY (1 ,0 ,KEY_8 ), +KEY (0 ,1 ,KEY_8 ), +KEY (0 ,2 ,KEY_I ), +KEY (0 ,3 ,KEY_J ), +KEY (0 ,4 ,KEY_N ), +KEY (0 ,5 ,KEY_M ), +KEY (1 ,0 ,KEY_0 ),KEY (1 ,1 ,KEY_7 ), -KEY (1 ,2 ,KEY_6 ), -KEY (1 ,3 ,KEY_5 ), -KEY (1 ,4 ,KEY_4 ), -KEY (1 ,5 ,KEY_3 ), -KEY (1 ,6 ,KEY_2 ), -KEY (1 ,7 ,KEY_1 ), -KEY (2 ,0 ,KEY_I ), -KEY (2 ,1 ,KEY_U ), +KEY (1 ,2 ,KEY_U ), +KEY (1 ,3 ,KEY_H ), +KEY (1 ,4 ,KEY_B ), +KEY (1 ,5 ,KEY_SPACE ), +KEY (2 ,0 ,KEY_BACKSPACE ), +KEY (2 ,1 ,KEY_6 ),KEY (2 ,2 ,KEY_Y ), -KEY (2 ,3 ,KEY_T ), -KEY (2 ,4 ,KEY_R ), -KEY (2 ,5 ,KEY_E ), -KEY (2 ,6 ,KEY_W ), -KEY (2 ,7 ,KEY_Q ), -KEY (3 ,0 ,KEY_J ), -KEY (3 ,1 ,KEY_H ), -KEY (3 ,2 ,KEY_G ), +KEY (2 ,3 ,KEY_G ), +KEY (2 ,4 ,KEY_V ), +KEY (2 ,5 ,KEY_FN ), +KEY (3 ,0 ,KEY_O ), +KEY (3 ,1 ,KEY_5 ), +KEY (3 ,2 ,KEY_T ),KEY (3 ,3 ,KEY_F ), -KEY (3 ,4 ,KEY_D ), -KEY (3 ,5 ,KEY_S ), -KEY (3 ,6 ,KEY_A ), -KEY (3 ,7 ,KEY_LEFTSHIFT ), -KEY (4 ,0 ,KEY_N ), -KEY (4 ,1 ,KEY_B ), -KEY (4 ,2 ,KEY_V ), -KEY (4 ,3 ,KEY_C ), +KEY (3 ,4 ,KEY_C ), +KEY (4 ,0 ,KEY_P ), +KEY (4 ,1 ,KEY_4 ), +KEY (4 ,2 ,KEY_R ), +KEY (4 ,3 ,KEY_D ),KEY (4 ,4 ,KEY_X ), -KEY (4 ,5 ,KEY_Z ), -KEY (4 ,6 ,KEY_DOT ), -KEY (4 ,7 ,KEY_COMMA ), -KEY (5 ,0 ,KEY_M ), -KEY (5 ,1 ,KEY_SPACE ), -KEY (5 ,2 ,KEY_FN ), +KEY (5 ,0 ,KEY_K ), +KEY (5 ,1 ,KEY_3 ), +KEY (5 ,2 ,KEY_E ), +KEY (5 ,3 ,KEY_S ), +KEY (5 ,4 ,KEY_Z ), +KEY (6 ,0 ,KEY_L ), +KEY (6 ,1 ,KEY_2 ), +KEY (6 ,2 ,KEY_W ), +KEY (6 ,3 ,KEY_A ), +KEY (6 ,4 ,KEY_DOT ), +KEY (7 ,0 ,KEY_ENTER ), +KEY (7 ,1 ,KEY_1 ), +KEY (7 ,2 ,KEY_Q ), +KEY (7 ,3 ,KEY_LEFTSHIFT ), +KEY (7 ,4 ,KEY_COMMA ), };static struct matrix_keymap_data board_map_data = {
Signature · 1 line
1.5.6.3
Tony Lindgren
maintainerPATCH 1/1 omap: pandora: fix keypad keymap
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: omap-fixes
Initial commit ID (Likely to change): 59629cae23f33091c9966439afd0eeb849be4c6e
PatchWorks
http://patchwork.kernel.org/patch/58387/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=59629cae23f33091c9966439afd0eeb849be4c6e