Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / mach-omap1 / board-h3.c

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 9126e3e..dbc8b8d 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -56,43 +56,42 @@
 
 #define H3_TS_GPIO     48
 
-static int h3_keymap[] = {
+static const unsigned int h3_keymap[] = {
        KEY(0, 0, KEY_LEFT),
-       KEY(0, 1, KEY_RIGHT),
-       KEY(0, 2, KEY_3),
-       KEY(0, 3, KEY_F10),
-       KEY(0, 4, KEY_F5),
-       KEY(0, 5, KEY_9),
-       KEY(1, 0, KEY_DOWN),
+       KEY(1, 0, KEY_RIGHT),
+       KEY(2, 0, KEY_3),
+       KEY(3, 0, KEY_F10),
+       KEY(4, 0, KEY_F5),
+       KEY(5, 0, KEY_9),
+       KEY(0, 1, KEY_DOWN),
        KEY(1, 1, KEY_UP),
-       KEY(1, 2, KEY_2),
-       KEY(1, 3, KEY_F9),
-       KEY(1, 4, KEY_F7),
-       KEY(1, 5, KEY_0),
-       KEY(2, 0, KEY_ENTER),
-       KEY(2, 1, KEY_6),
+       KEY(2, 1, KEY_2),
+       KEY(3, 1, KEY_F9),
+       KEY(4, 1, KEY_F7),
+       KEY(5, 1, KEY_0),
+       KEY(0, 2, KEY_ENTER),
+       KEY(1, 2, KEY_6),
        KEY(2, 2, KEY_1),
-       KEY(2, 3, KEY_F2),
-       KEY(2, 4, KEY_F6),
-       KEY(2, 5, KEY_HOME),
-       KEY(3, 0, KEY_8),
-       KEY(3, 1, KEY_5),
-       KEY(3, 2, KEY_F12),
+       KEY(3, 2, KEY_F2),
+       KEY(4, 2, KEY_F6),
+       KEY(5, 2, KEY_HOME),
+       KEY(0, 3, KEY_8),
+       KEY(1, 3, KEY_5),
+       KEY(2, 3, KEY_F12),
        KEY(3, 3, KEY_F3),
-       KEY(3, 4, KEY_F8),
-       KEY(3, 5, KEY_END),
-       KEY(4, 0, KEY_7),
-       KEY(4, 1, KEY_4),
-       KEY(4, 2, KEY_F11),
-       KEY(4, 3, KEY_F1),
+       KEY(4, 3, KEY_F8),
+       KEY(5, 3, KEY_END),
+       KEY(0, 4, KEY_7),
+       KEY(1, 4, KEY_4),
+       KEY(2, 4, KEY_F11),
+       KEY(3, 4, KEY_F1),
        KEY(4, 4, KEY_F4),
-       KEY(4, 5, KEY_ESC),
-       KEY(5, 0, KEY_F13),
-       KEY(5, 1, KEY_F14),
-       KEY(5, 2, KEY_F15),
-       KEY(5, 3, KEY_F16),
-       KEY(5, 4, KEY_SLEEP),
-       0
+       KEY(5, 4, KEY_ESC),
+       KEY(0, 5, KEY_F13),
+       KEY(1, 5, KEY_F14),
+       KEY(2, 5, KEY_F15),
+       KEY(3, 5, KEY_F16),
+       KEY(4, 5, KEY_SLEEP),
 };
 
 
@@ -264,6 +263,15 @@ static struct platform_device smc91x_device = {
        .resource       = smc91x_resources,
 };
 
+static void __init h3_init_smc91x(void)
+{
+       omap_cfg_reg(W15_1710_GPIO40);
+       if (gpio_request(40, "SMC91x irq") < 0) {
+               printk("Error requesting gpio 40 for smc91x irq\n");
+               return;
+       }
+}
+
 #define GPTIMER_BASE           0xFFFB1400
 #define GPTIMER_REGS(x)        (0xFFFB1400 + (x * 0x800))
 #define GPTIMER_REGS_SIZE      0x46
@@ -296,14 +304,18 @@ static struct resource h3_kp_resources[] = {
        },
 };
 
+static const struct matrix_keymap_data h3_keymap_data = {
+       .keymap         = h3_keymap,
+       .keymap_size    = ARRAY_SIZE(h3_keymap),
+};
+
 static struct omap_kp_platform_data h3_kp_data = {
        .rows           = 8,
        .cols           = 8,
-       .keymap         = h3_keymap,
-       .keymapsize     = ARRAY_SIZE(h3_keymap),
-       .rep            = 1,
+       .keymap_data    = &h3_keymap_data,
+       .rep            = true,
        .delay          = 9,
-       .dbounce        = 1,
+       .dbounce        = true,
 };
 
 static struct platform_device h3_kp_device = {
@@ -376,6 +388,8 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {
 
 static void __init h3_init(void)
 {
+       h3_init_smc91x();
+
        /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped
         * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will
         * notice whether a NAND chip is enabled at probe time.
@@ -422,21 +436,10 @@ static void __init h3_init(void)
        h3_mmc_init();
 }
 
-static void __init h3_init_smc91x(void)
-{
-       omap_cfg_reg(W15_1710_GPIO40);
-       if (gpio_request(40, "SMC91x irq") < 0) {
-               printk("Error requesting gpio 40 for smc91x irq\n");
-               return;
-       }
-}
-
 static void __init h3_init_irq(void)
 {
        omap1_init_common_hw();
        omap_init_irq();
-       omap_gpio_init();
-       h3_init_smc91x();
 }
 
 static void __init h3_map_io(void)