diff options
| author | Albert ARIBAUD <[email protected]> | 2014-01-08 20:48:26 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <[email protected]> | 2014-01-08 20:48:26 +0100 |
| commit | 6e51ca41002c5e92f7fec088320e340102dd3f5b (patch) | |
| tree | 555a568280a97d8d504c78325da116cdfced9188 /drivers | |
| parent | e28d4a272f4e59185581f9c7252016872b4681e6 (diff) | |
| parent | e0a1d598ef0155f31589c42db17ff4784e84ca67 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/ns16550.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 181c81815ac..fbc37b27e8e 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -56,9 +56,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_TI81XX) || \ - defined(CONFIG_AM43XX) +#if defined(CONFIG_OMAP) || 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); |