diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2013-10-20 23:40:16 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2013-10-20 23:40:16 +0000 |
| commit | 6dd028d8f8936db56c51fe2d5c46e10dc2ca44d3 (patch) | |
| tree | 1cf0a76610de38ac6a680600a988ec85388bcd2b /sys/dev/uart | |
| parent | 58ac6f25fa2b1f32a86be925f61bc2fb40cf2205 (diff) | |
Notes
Diffstat (limited to 'sys/dev/uart')
| -rw-r--r-- | sys/dev/uart/uart_dev_pl011.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index 583dedfcc70e..82e8b03654d0 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -147,9 +147,6 @@ uart_pl011_param(struct uart_bas *bas, int baudrate, int databits, int stopbits, break; } - /* TODO: Calculate divisors */ - baud = (0x1 << 16) | 0x28; - if (stopbits == 2) line |= LCR_H_STP2; else @@ -164,8 +161,11 @@ uart_pl011_param(struct uart_bas *bas, int baudrate, int databits, int stopbits, line &= ~LCR_H_FEN; ctrl |= (CR_RXE | CR_TXE | CR_UARTEN); - __uart_setreg(bas, UART_IBRD, ((uint32_t)(baud >> 16)) & IBRD_BDIVINT); - __uart_setreg(bas, UART_FBRD, (uint32_t)(baud) & FBRD_BDIVFRAC); + if (bas->rclk != 0 && baudrate != 0) { + baud = bas->rclk * 4 / baudrate; + __uart_setreg(bas, UART_IBRD, ((uint32_t)(baud >> 6)) & IBRD_BDIVINT); + __uart_setreg(bas, UART_FBRD, (uint32_t)(baud & 0x3F) & FBRD_BDIVFRAC); + } /* Add config. to line before reenabling UART */ __uart_setreg(bas, UART_LCR_H, (__uart_getreg(bas, UART_LCR_H) & |