Keyboard: omap-keypad: use matrix_keypad.h

[karo-tx-linux.git] / arch / arm / mach-omap1 / board-h2.c

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index d2cda58bcc480873c9befbd9806366f358283779..28b84aa9bdba9d0c6090392036a7838c0983a11d 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -52,43 +52,42 @@
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define OMAP1610_ETHR_START            0x04000300
 
-static int h2_keymap[] = {
+static const unsigned int h2_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),
 };
 
 static struct mtd_partition h2_nor_partitions[] = {
@@ -270,14 +269,18 @@ static struct resource h2_kp_resources[] = {
        },
 };
 
+static const struct matrix_keymap_data h2_keymap_data = {
+       .keymap         = h2_keymap,
+       .keymap_size    = ARRAY_SIZE(h2_keymap),
+};
+
 static struct omap_kp_platform_data h2_kp_data = {
        .rows           = 8,
        .cols           = 8,
-       .keymap         = h2_keymap,
-       .keymapsize     = ARRAY_SIZE(h2_keymap),
-       .rep            = 1,
+       .keymap_data    = &h2_keymap_data,
+       .rep            = true,
        .delay          = 9,
-       .dbounce        = 1,
+       .dbounce        = true,
 };
 
 static struct platform_device h2_kp_device = {
@@ -374,8 +377,6 @@ static void __init h2_init_irq(void)
 {
        omap1_init_common_hw();
        omap_init_irq();
-       omap_gpio_init();
-       h2_init_smc91x();
 }
 
 static struct omap_usb_config h2_usb_config __initdata = {
@@ -403,6 +404,8 @@ static struct omap_board_config_kernel h2_config[] __initdata = {
 
 static void __init h2_init(void)
 {
+       h2_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.
@@ -458,8 +461,6 @@ static void __init h2_map_io(void)
 
 MACHINE_START(OMAP_H2, "TI-H2")
        /* Maintainer: Imre Deak <imre.deak@nokia.com> */
-       .phys_io        = 0xfff00000,
-       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
        .boot_params    = 0x10000100,
        .map_io         = h2_map_io,
        .reserve        = omap_reserve,