Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / tty / serial / ucc_uart.c

diff --git a/kernel/drivers/tty/serial/ucc_uart.c b/kernel/drivers/tty/serial/ucc_uart.c
index 7d2532b..71d26c8 100644 (file)
--- a/kernel/drivers/tty/serial/ucc_uart.c
+++ b/kernel/drivers/tty/serial/ucc_uart.c
@@ -950,7 +950,7 @@ static void qe_uart_set_termios(struct uart_port *port,
        if ((termios->c_cflag & CREAD) == 0)
                port->read_status_mask &= ~BD_SC_EMPTY;
 
-       baud = uart_get_baud_rate(port, termios, old, 0, 115200);
+       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16);
 
        /* Do we really need a spinlock here? */
        spin_lock_irqsave(&port->lock, flags);
@@ -1478,6 +1478,9 @@ static const struct of_device_id ucc_uart_match[] = {
                .type = "serial",
                .compatible = "ucc_uart",
        },
+       {
+               .compatible = "fsl,t1040-ucc-uart",
+       },
        {},
 };
 MODULE_DEVICE_TABLE(of, ucc_uart_match);