Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-fsample.c

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index f65baa95986ea9717632690404dd77c47a1cc1c5..6e73b9ab58844c69ac738689e16d9446a0c25ef7 100644 (file)
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -30,6 +30,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
+#include <asm/arch/nand.h>
 #include <asm/arch/keypad.h>
 #include <asm/arch/common.h>
 #include <asm/arch/board.h>
@@ -40,31 +41,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
 };
@@ -136,7 +135,7 @@ static struct platform_device nor_device = {
        .resource       = &nor_resource,
 };
 
-static struct nand_platform_data nand_data = {
+static struct omap_nand_platform_data nand_data = {
        .options        = NAND_SAMSUNG_LP_OPTIONS,
 };
 
@@ -204,7 +203,7 @@ static struct platform_device *devices[] __initdata = {
 
 #define P2_NAND_RB_GPIO_PIN    62
 
-static int nand_dev_ready(struct nand_platform_data *data)
+static int nand_dev_ready(struct omap_nand_platform_data *data)
 {
        return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN);
 }
@@ -235,6 +234,7 @@ static void __init omap_fsample_init(void)
        omap_board_config = fsample_config;
        omap_board_config_size = ARRAY_SIZE(fsample_config);
        omap_serial_init();
+       omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
 static void __init fsample_init_smc91x(void)