diff options
| author | Rob Herring <r.herring@freescale.com> | 2010-03-05 15:08:23 -0600 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2010-03-09 09:38:20 -0600 |
| commit | 5489e910140e8bae27ecb02314449e2a05fe91ab (patch) | |
| tree | 889796fbc52321e2ec598e06efabe0ff81c0c670 /arch/arm/mach-mx25 | |
| parent | adb8edf654fc1885df95e5b49c4725566640eebc (diff) | |
ENGR00121365 mxcuart: rework early uart console
Rework early uart to pass in uart base and clock ptr from board.
Now early console for ttymxc is always enabled and mxcuart console
is not needed.
Add fix work-around u-boot illegal uart setup. uboot sets fifo
trigger levels to reserved values which breaks early uart console.
Use TXFE instead of TRDY.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx25')
| -rw-r--r-- | arch/arm/mach-mx25/mx25_3stack.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/mx25_3stack.c b/arch/arm/mach-mx25/mx25_3stack.c index 314a6f66fca1..557447964d09 100644 --- a/arch/arm/mach-mx25/mx25_3stack.c +++ b/arch/arm/mach-mx25/mx25_3stack.c @@ -631,7 +631,11 @@ static inline void mxc_init_mmc(void) static void __init mx25_3stack_timer_init(void) { + struct clk *uart_clk; + mx25_clocks_init(24000000); + uart_clk = clk_get(NULL, "uart_clk.0"); + early_console_setup(UART1_BASE_ADDR, uart_clk); } static struct sys_timer mxc_timer = { @@ -730,7 +734,6 @@ static void __init mxc_board_init(void) mxc_cpu_common_init(); mxc_register_gpios(); mx25_3stack_gpio_init(); - early_console_setup(saved_command_line); mxc_init_keypad(); #ifdef CONFIG_I2C i2c_register_board_info(0, mxc_i2c_board_info, |