colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: ns16550: Use old baud rate divisor for flushing if not given

Browse Source 
If baud_divisor is not set (i.e. == -1), we should use the baud divisor
already in use for flushing the xmit register. If we don't flush the
xmit register, then SPL will hang.

Signed-off-by: Patrik Dahlström <risca@dalakolonin.se>
This commit is contained in:
Patrik Dahlström
2019-12-21 17:25:12 +01:00
committed by Tom Rini
parent b1b147f2b8
commit 1c16606aac
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/serial/ns16550.c
View File

@@ -171,6 +171,13 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)
== UART_LSR_THRE) { == UART_LSR_THRE) {
if (baud_divisor != -1) if (baud_divisor != -1)
NS16550_setbrg(com_port, baud_divisor); NS16550_setbrg(com_port, baud_divisor);
else {
// Re-use old baud rate divisor to flush transmit reg.
const int dll = serial_in(&com_port->dll);
const int dlm = serial_in(&com_port->dlm);
const int divisor = dll | (dlm << 8);
NS16550_setbrg(com_port, divisor);
}
serial_out(0, &com_port->mdr1); serial_out(0, &com_port->mdr1);
} }
#endif #endif