ARM: OMAP1: Keymap fix for f-sample and p2-sample

[linux-2.6] / arch / arm / mach-omap1 / board-perseus2.c

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 64b45d8ae357e9e7e3addb767707201672aa6031..e44437e10eefe7a751230c4f72097f4f63b96508 100644 (file)
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -39,31 +39,29 @@ static int p2_keymap[] = {
        KEY(0,1,KEY_RIGHT),
        KEY(0,2,KEY_LEFT),
        KEY(0,3,KEY_DOWN),
-       KEY(0,4,KEY_CENTER),
-       KEY(0,5,KEY_0_5),
-       KEY(1,0,KEY_SOFT2),
+       KEY(0,4,KEY_ENTER),
+       KEY(1,0,KEY_F10),
        KEY(1,1,KEY_SEND),
        KEY(1,2,KEY_END),
        KEY(1,3,KEY_VOLUMEDOWN),
        KEY(1,4,KEY_VOLUMEUP),
        KEY(1,5,KEY_RECORD),
-       KEY(2,0,KEY_SOFT1),
+       KEY(2,0,KEY_F9),
        KEY(2,1,KEY_3),
        KEY(2,2,KEY_6),
        KEY(2,3,KEY_9),
-       KEY(2,4,KEY_SHARP),
-       KEY(2,5,KEY_2_5),
+       KEY(2,4,KEY_KPDOT),
        KEY(3,0,KEY_BACK),
        KEY(3,1,KEY_2),
        KEY(3,2,KEY_5),
        KEY(3,3,KEY_8),
        KEY(3,4,KEY_0),
-       KEY(3,5,KEY_HEADSETHOOK),
+       KEY(3,5,KEY_KPSLASH),
        KEY(4,0,KEY_HOME),
        KEY(4,1,KEY_1),
        KEY(4,2,KEY_4),
        KEY(4,3,KEY_7),
-       KEY(4,4,KEY_STAR),
+       KEY(4,4,KEY_KPASTERISK),
        KEY(4,5,KEY_POWER),
        0
 };
@@ -171,9 +169,12 @@ static struct resource kp_resources[] = {
 };
 
 static struct omap_kp_platform_data kp_data = {
-       .rows   = 8,
-       .cols   = 8,
-       .keymap = p2_keymap,
+       .rows           = 8,
+       .cols           = 8,
+       .keymap         = p2_keymap,
+       .keymapsize     = ARRAY_SIZE(p2_keymap),
+       .delay          = 4,
+       .dbounce        = 1,
 };
 
 static struct platform_device kp_device = {
@@ -243,7 +244,7 @@ static void __init perseus2_init_smc91x(void)
        mdelay(50);
 }
 
-void omap_perseus2_init_irq(void)
+static void __init omap_perseus2_init_irq(void)
 {
        omap1_init_common_hw();
        omap_init_irq();