diff options
| author | Tom Rini <trini@ti.com> | 2013-08-18 14:14:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-18 14:14:34 -0400 |
| commit | e20cc2ca15b5b0644f51b6e58d530d70acd2bc00 (patch) | |
| tree | f85a22536682ef54e77b1ba95cf0b71d00644632 /drivers/serial | |
| parent | f21876174364391757e743cb8673d3fc5fce7ac7 (diff) | |
| parent | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (diff) | |
| download | u-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.zip u-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.tar.gz u-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.tar.bz2 | |
Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.
Conflicts:
arch/arm/include/asm/arch-am33xx/hardware.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/ns16550.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index d77c25f..181c818 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -57,7 +57,8 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier); #if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \ - defined(CONFIG_AM33XX) || defined(CONFIG_TI814X) + defined(CONFIG_AM33XX) || defined(CONFIG_TI81XX) || \ + defined(CONFIG_AM43XX) serial_out(0x7, &com_port->mdr1); /* mode select reset TL16C750*/ #endif serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr); @@ -72,7 +73,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) serial_out(UART_LCRVAL, &com_port->lcr); #if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \ defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \ - defined(CONFIG_TI814X) + defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX) /* /16 is proper to hit 115200 with 48MHz */ serial_out(0, &com_port->mdr1); |