diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 8236708c3627..b43f6e36b6d9 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -305,14 +305,6 @@ static int __init omap3pandora_i2c_init(void) | |||
305 | return 0; | 305 | return 0; |
306 | } | 306 | } |
307 | 307 | ||
308 | static void __init omap3pandora_init_irq(void) | ||
309 | { | ||
310 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
311 | mt46h32m32lf6_sdrc_params); | ||
312 | omap_init_irq(); | ||
313 | omap_gpio_init(); | ||
314 | } | ||
315 | |||
316 | static void __init omap3pandora_ads7846_init(void) | 308 | static void __init omap3pandora_ads7846_init(void) |
317 | { | 309 | { |
318 | int gpio = OMAP3_PANDORA_TS_GPIO; | 310 | int gpio = OMAP3_PANDORA_TS_GPIO; |
@@ -375,6 +367,16 @@ static struct omap_board_config_kernel omap3pandora_config[] __initdata = { | |||
375 | { OMAP_TAG_LCD, &omap3pandora_lcd_config }, | 367 | { OMAP_TAG_LCD, &omap3pandora_lcd_config }, |
376 | }; | 368 | }; |
377 | 369 | ||
370 | static void __init omap3pandora_init_irq(void) | ||
371 | { | ||
372 | omap_board_config = omap3pandora_config; | ||
373 | omap_board_config_size = ARRAY_SIZE(omap3pandora_config); | ||
374 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
375 | mt46h32m32lf6_sdrc_params); | ||
376 | omap_init_irq(); | ||
377 | omap_gpio_init(); | ||
378 | } | ||
379 | |||
378 | static struct platform_device *omap3pandora_devices[] __initdata = { | 380 | static struct platform_device *omap3pandora_devices[] __initdata = { |
379 | &omap3pandora_lcd_device, | 381 | &omap3pandora_lcd_device, |
380 | &pandora_leds_gpio, | 382 | &pandora_leds_gpio, |
@@ -386,8 +388,6 @@ static void __init omap3pandora_init(void) | |||
386 | omap3pandora_i2c_init(); | 388 | omap3pandora_i2c_init(); |
387 | platform_add_devices(omap3pandora_devices, | 389 | platform_add_devices(omap3pandora_devices, |
388 | ARRAY_SIZE(omap3pandora_devices)); | 390 | ARRAY_SIZE(omap3pandora_devices)); |
389 | omap_board_config = omap3pandora_config; | ||
390 | omap_board_config_size = ARRAY_SIZE(omap3pandora_config); | ||
391 | omap_serial_init(); | 391 | omap_serial_init(); |
392 | spi_register_board_info(omap3pandora_spi_board_info, | 392 | spi_register_board_info(omap3pandora_spi_board_info, |
393 | ARRAY_SIZE(omap3pandora_spi_board_info)); | 393 | ARRAY_SIZE(omap3pandora_spi_board_info)); |