]> err.no Git - linux-2.6/commitdiff
ARM: OMAP1: Keymap fix for f-sample and p2-sample
authorVivek Kutal <vivek.kutal@celunite.com>
Mon, 7 Jan 2008 14:04:00 +0000 (12:04 -0200)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Jan 2008 23:52:15 +0000 (15:52 -0800)
Keymap fix for f-sample and p2-sample.

Signed-off-by: Vivek Kutal <vivek.kutal@celunite.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-perseus2.c

index f65baa95986ea9717632690404dd77c47a1cc1c5..d5f6ea14fc7bdf241cbc9f26568d0abc3ac57e03 100644 (file)
@@ -40,31 +40,29 @@ static int fsample_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
 };
index 1d5c8d5097222ad1289b4edf8664febb66434b61..e44437e10eefe7a751230c4f72097f4f63b96508 100644 (file)
@@ -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
 };