Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap1 / board-sx1.c

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index d25f59e5a7733ca79c23b18662bf701aa49f936b..d41fe2d0616adeef602d08e785f4681e5963bb52 100644 (file)
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -164,36 +164,35 @@ EXPORT_SYMBOL(sx1_setusbpower);
 
 /*----------- Keypad -------------------------*/
 
-static int sx1_keymap[] = {
-       KEY(5, 3, GROUP_0 | 117), /* camera Qt::Key_F17 */
-       KEY(0, 4, GROUP_0 | 114), /* voice memo Qt::Key_F14 */
-       KEY(1, 4, GROUP_2 | 114), /* voice memo */
-       KEY(2, 4, GROUP_3 | 114), /* voice memo */
+static const unsigned int sx1_keymap[] = {
+       KEY(3, 5, GROUP_0 | 117), /* camera Qt::Key_F17 */
+       KEY(4, 0, GROUP_0 | 114), /* voice memo Qt::Key_F14 */
+       KEY(4, 1, GROUP_2 | 114), /* voice memo */
+       KEY(4, 2, GROUP_3 | 114), /* voice memo */
        KEY(0, 0, GROUP_1 | KEY_F12),   /* red button Qt::Key_Hangup */
-       KEY(4, 3, GROUP_1 | KEY_LEFT),
-       KEY(2, 3, GROUP_1 | KEY_DOWN),
-       KEY(1, 3, GROUP_1 | KEY_RIGHT),
-       KEY(0, 3, GROUP_1 | KEY_UP),
+       KEY(3, 4, GROUP_1 | KEY_LEFT),
+       KEY(3, 2, GROUP_1 | KEY_DOWN),
+       KEY(3, 1, GROUP_1 | KEY_RIGHT),
+       KEY(3, 0, GROUP_1 | KEY_UP),
        KEY(3, 3, GROUP_1 | KEY_POWER), /* joystick press or Qt::Key_Select */
-       KEY(5, 0, GROUP_1 | KEY_1),
-       KEY(4, 0, GROUP_1 | KEY_2),
-       KEY(3, 0, GROUP_1 | KEY_3),
-       KEY(3, 4, GROUP_1 | KEY_4),
+       KEY(0, 5, GROUP_1 | KEY_1),
+       KEY(0, 4, GROUP_1 | KEY_2),
+       KEY(0, 3, GROUP_1 | KEY_3),
+       KEY(4, 3, GROUP_1 | KEY_4),
        KEY(4, 4, GROUP_1 | KEY_5),
-       KEY(5, 4, GROUP_1 | KEY_KPASTERISK),/* "*" */
-       KEY(4, 1, GROUP_1 | KEY_6),
-       KEY(5, 1, GROUP_1 | KEY_7),
-       KEY(3, 1, GROUP_1 | KEY_8),
-       KEY(3, 2, GROUP_1 | KEY_9),
-       KEY(5, 2, GROUP_1 | KEY_0),
-       KEY(4, 2, GROUP_1 | 113),       /* # F13 Toggle input method Qt::Key_F13 */
-       KEY(0, 1, GROUP_1 | KEY_F11),   /* green button Qt::Key_Call */
-       KEY(1, 2, GROUP_1 | KEY_YEN),   /* left soft Qt::Key_Context1 */
+       KEY(4, 5, GROUP_1 | KEY_KPASTERISK),/* "*" */
+       KEY(1, 4, GROUP_1 | KEY_6),
+       KEY(1, 5, GROUP_1 | KEY_7),
+       KEY(1, 3, GROUP_1 | KEY_8),
+       KEY(2, 3, GROUP_1 | KEY_9),
+       KEY(2, 5, GROUP_1 | KEY_0),
+       KEY(2, 4, GROUP_1 | 113), /* # F13 Toggle input method Qt::Key_F13 */
+       KEY(1, 0, GROUP_1 | KEY_F11),   /* green button Qt::Key_Call */
+       KEY(2, 1, GROUP_1 | KEY_YEN),   /* left soft Qt::Key_Context1 */
        KEY(2, 2, GROUP_1 | KEY_F8),    /* right soft Qt::Key_Back */
-       KEY(2, 1, GROUP_1 | KEY_LEFTSHIFT), /* shift */
+       KEY(1, 2, GROUP_1 | KEY_LEFTSHIFT), /* shift */
        KEY(1, 1, GROUP_1 | KEY_BACKSPACE), /* C (clear) */
-       KEY(0, 2, GROUP_1 | KEY_F7),    /* menu Qt::Key_Menu */
-       0
+       KEY(2, 0, GROUP_1 | KEY_F7),    /* menu Qt::Key_Menu */
 };
 
 static struct resource sx1_kp_resources[] = {
@@ -204,11 +203,15 @@ static struct resource sx1_kp_resources[] = {
        },
 };
 
+static const struct matrix_keymap_data sx1_keymap_data = {
+       .keymap         = sx1_keymap,
+       .keymap_size    = ARRAY_SIZE(sx1_keymap),
+};
+
 static struct omap_kp_platform_data sx1_kp_data = {
        .rows           = 6,
        .cols           = 6,
-       .keymap = sx1_keymap,
-       .keymapsize = ARRAY_SIZE(sx1_keymap),
+       .keymap_data    = &sx1_keymap_data,
        .delay  = 80,
 };
 
@@ -409,7 +412,6 @@ static void __init omap_sx1_init_irq(void)
 {
        omap1_init_common_hw();
        omap_init_irq();
-       omap_gpio_init();
 }
 /*----------------------------------------*/