diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-fsample.c')
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index f550b19e1ecd..1bdb66638e29 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <asm/arch/gpio.h> | 30 | #include <asm/arch/gpio.h> |
31 | #include <asm/arch/mux.h> | 31 | #include <asm/arch/mux.h> |
32 | #include <asm/arch/fpga.h> | 32 | #include <asm/arch/fpga.h> |
33 | #include <asm/arch/nand.h> | ||
33 | #include <asm/arch/keypad.h> | 34 | #include <asm/arch/keypad.h> |
34 | #include <asm/arch/common.h> | 35 | #include <asm/arch/common.h> |
35 | #include <asm/arch/board.h> | 36 | #include <asm/arch/board.h> |
@@ -134,7 +135,7 @@ static struct platform_device nor_device = { | |||
134 | .resource = &nor_resource, | 135 | .resource = &nor_resource, |
135 | }; | 136 | }; |
136 | 137 | ||
137 | static struct nand_platform_data nand_data = { | 138 | static struct omap_nand_platform_data nand_data = { |
138 | .options = NAND_SAMSUNG_LP_OPTIONS, | 139 | .options = NAND_SAMSUNG_LP_OPTIONS, |
139 | }; | 140 | }; |
140 | 141 | ||
@@ -202,7 +203,7 @@ static struct platform_device *devices[] __initdata = { | |||
202 | 203 | ||
203 | #define P2_NAND_RB_GPIO_PIN 62 | 204 | #define P2_NAND_RB_GPIO_PIN 62 |
204 | 205 | ||
205 | static int nand_dev_ready(struct nand_platform_data *data) | 206 | static int nand_dev_ready(struct omap_nand_platform_data *data) |
206 | { | 207 | { |
207 | return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN); | 208 | return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN); |
208 | } | 209 | } |
@@ -233,6 +234,7 @@ static void __init omap_fsample_init(void) | |||
233 | omap_board_config = fsample_config; | 234 | omap_board_config = fsample_config; |
234 | omap_board_config_size = ARRAY_SIZE(fsample_config); | 235 | omap_board_config_size = ARRAY_SIZE(fsample_config); |
235 | omap_serial_init(); | 236 | omap_serial_init(); |
237 | omap_register_i2c_bus(1, 100, NULL, 0); | ||
236 | } | 238 | } |
237 | 239 | ||
238 | static void __init fsample_init_smc91x(void) | 240 | static void __init fsample_init_smc91x(void) |