diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 534dcfb9d263..94bc0745ab2c 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.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> |
@@ -133,7 +134,7 @@ static struct platform_device nor_device = { | |||
133 | .resource = &nor_resource, | 134 | .resource = &nor_resource, |
134 | }; | 135 | }; |
135 | 136 | ||
136 | static struct nand_platform_data nand_data = { | 137 | static struct omap_nand_platform_data nand_data = { |
137 | .options = NAND_SAMSUNG_LP_OPTIONS, | 138 | .options = NAND_SAMSUNG_LP_OPTIONS, |
138 | }; | 139 | }; |
139 | 140 | ||
@@ -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 | } |
@@ -215,7 +216,7 @@ static struct omap_lcd_config perseus2_lcd_config __initdata = { | |||
215 | .ctrl_name = "internal", | 216 | .ctrl_name = "internal", |
216 | }; | 217 | }; |
217 | 218 | ||
218 | static struct omap_board_config_kernel perseus2_config[] = { | 219 | static struct omap_board_config_kernel perseus2_config[] __initdata = { |
219 | { OMAP_TAG_UART, &perseus2_uart_config }, | 220 | { OMAP_TAG_UART, &perseus2_uart_config }, |
220 | { OMAP_TAG_LCD, &perseus2_lcd_config }, | 221 | { OMAP_TAG_LCD, &perseus2_lcd_config }, |
221 | }; | 222 | }; |
@@ -233,6 +234,7 @@ static void __init omap_perseus2_init(void) | |||
233 | omap_board_config = perseus2_config; | 234 | omap_board_config = perseus2_config; |
234 | omap_board_config_size = ARRAY_SIZE(perseus2_config); | 235 | omap_board_config_size = ARRAY_SIZE(perseus2_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 perseus2_init_smc91x(void) | 240 | static void __init perseus2_init_smc91x(void) |