diff options
author | Paul Walmsley <paul@pwsan.com> | 2009-09-03 13:14:02 -0400 |
---|---|---|
committer | paul <paul@twilight.(none)> | 2009-09-03 13:14:02 -0400 |
commit | b3c6df3ab2b17cd7ddf927d39a64f235b25ac8d4 (patch) | |
tree | 58d26a0b0dc5dc597519260ef04f8bff67cc4f8c /arch/arm/mach-omap2/board-overo.c | |
parent | 71348bcaac6f4c372525d4d62e88a82a7330435b (diff) |
OMAP2/3 board-*.c files: read bootloader configuration earlier
Most board-*.c files read configuration data from the bootloader in
their .init_machine() function. This needs to happen earlier, at some
point before omap2_init_common_hw() is called. This is because a
future patch will use the bootloader serial console port information
to enable the UART clocks earlier, immediately after omap2_clk_init().
This is in turn necessary since otherwise clock tree usecounts on
clocks like dpll4_m2x2_ck will be bogus, which can cause the
currently-active console UART clock to be disabled during boot.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index eb78e6eab4f4..9917d2fddc2f 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -357,14 +357,6 @@ static int __init overo_i2c_init(void) | |||
357 | return 0; | 357 | return 0; |
358 | } | 358 | } |
359 | 359 | ||
360 | static void __init overo_init_irq(void) | ||
361 | { | ||
362 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
363 | mt46h32m32lf6_sdrc_params); | ||
364 | omap_init_irq(); | ||
365 | omap_gpio_init(); | ||
366 | } | ||
367 | |||
368 | static struct platform_device overo_lcd_device = { | 360 | static struct platform_device overo_lcd_device = { |
369 | .name = "overo_lcd", | 361 | .name = "overo_lcd", |
370 | .id = -1, | 362 | .id = -1, |
@@ -378,6 +370,16 @@ static struct omap_board_config_kernel overo_config[] __initdata = { | |||
378 | { OMAP_TAG_LCD, &overo_lcd_config }, | 370 | { OMAP_TAG_LCD, &overo_lcd_config }, |
379 | }; | 371 | }; |
380 | 372 | ||
373 | static void __init overo_init_irq(void) | ||
374 | { | ||
375 | omap_board_config = overo_config; | ||
376 | omap_board_config_size = ARRAY_SIZE(overo_config); | ||
377 | omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
378 | mt46h32m32lf6_sdrc_params); | ||
379 | omap_init_irq(); | ||
380 | omap_gpio_init(); | ||
381 | } | ||
382 | |||
381 | static struct platform_device *overo_devices[] __initdata = { | 383 | static struct platform_device *overo_devices[] __initdata = { |
382 | &overo_lcd_device, | 384 | &overo_lcd_device, |
383 | }; | 385 | }; |
@@ -386,8 +388,6 @@ static void __init overo_init(void) | |||
386 | { | 388 | { |
387 | overo_i2c_init(); | 389 | overo_i2c_init(); |
388 | platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices)); | 390 | platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices)); |
389 | omap_board_config = overo_config; | ||
390 | omap_board_config_size = ARRAY_SIZE(overo_config); | ||
391 | omap_serial_init(); | 391 | omap_serial_init(); |
392 | overo_flash_init(); | 392 | overo_flash_init(); |
393 | usb_musb_init(); | 393 | usb_musb_init(); |