svn commit: r259319 - stable/10/sys/dev/uart

[Ian Lepore]

Author: ian
Date: Fri Dec 13 18:21:27 2013
New Revision: 259319
URL: http://svnweb.freebsd.org/changeset/base/259319

Log:
  MFC r256815:
  
    Calculate the baud rate divisor rather than using a hard-coded value.

Modified:
  stable/10/sys/dev/uart/uart_dev_pl011.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/uart/uart_dev_pl011.c
==============================================================================
--- stable/10/sys/dev/uart/uart_dev_pl011.c	Fri Dec 13 17:29:31 2013	(r259318)
+++ stable/10/sys/dev/uart/uart_dev_pl011.c	Fri Dec 13 18:21:27 2013	(r259319)
@@ -147,9 +147,6 @@ uart_pl011_param(struct uart_bas *bas, i
 		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, i
 	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) &