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-rx51.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-rx51.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index c0d13401425f..f9196c3b1a7b 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
@@ -56,6 +56,8 @@ static struct omap_board_config_kernel rx51_config[] = { | |||
56 | 56 | ||
57 | static void __init rx51_init_irq(void) | 57 | static void __init rx51_init_irq(void) |
58 | { | 58 | { |
59 | omap_board_config = rx51_config; | ||
60 | omap_board_config_size = ARRAY_SIZE(rx51_config); | ||
59 | omap2_init_common_hw(NULL, NULL); | 61 | omap2_init_common_hw(NULL, NULL); |
60 | omap_init_irq(); | 62 | omap_init_irq(); |
61 | omap_gpio_init(); | 63 | omap_gpio_init(); |
@@ -65,8 +67,6 @@ extern void __init rx51_peripherals_init(void); | |||
65 | 67 | ||
66 | static void __init rx51_init(void) | 68 | static void __init rx51_init(void) |
67 | { | 69 | { |
68 | omap_board_config = rx51_config; | ||
69 | omap_board_config_size = ARRAY_SIZE(rx51_config); | ||
70 | omap_serial_init(); | 70 | omap_serial_init(); |
71 | usb_musb_init(); | 71 | usb_musb_init(); |
72 | rx51_peripherals_init(); | 72 | rx51_peripherals_init(); |