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/plat-omap | |
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/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/include/mach/serial.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index def0529c75eb..e249186d26e2 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h | |||
@@ -13,6 +13,8 @@ | |||
13 | #ifndef __ASM_ARCH_SERIAL_H | 13 | #ifndef __ASM_ARCH_SERIAL_H |
14 | #define __ASM_ARCH_SERIAL_H | 14 | #define __ASM_ARCH_SERIAL_H |
15 | 15 | ||
16 | #include <linux/init.h> | ||
17 | |||
16 | #if defined(CONFIG_ARCH_OMAP1) | 18 | #if defined(CONFIG_ARCH_OMAP1) |
17 | /* OMAP1 serial ports */ | 19 | /* OMAP1 serial ports */ |
18 | #define OMAP_UART1_BASE 0xfffb0000 | 20 | #define OMAP_UART1_BASE 0xfffb0000 |
@@ -53,6 +55,7 @@ | |||
53 | }) | 55 | }) |
54 | 56 | ||
55 | #ifndef __ASSEMBLER__ | 57 | #ifndef __ASSEMBLER__ |
58 | extern void __init omap_serial_early_init(void); | ||
56 | extern void omap_serial_init(void); | 59 | extern void omap_serial_init(void); |
57 | extern int omap_uart_can_sleep(void); | 60 | extern int omap_uart_can_sleep(void); |
58 | extern void omap_uart_check_wakeup(void); | 61 | extern void omap_uart_check_wakeup(void); |