提交 1685118f 编写于 作者: A Alexander Shiyan 提交者: Greg Kroah-Hartman

serial: sccnxp: Report actual baudrate back to core

Signed-off-by: NAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 93b5c032
...@@ -213,7 +213,7 @@ const struct baud_table baud_std[] = { ...@@ -213,7 +213,7 @@ const struct baud_table baud_std[] = {
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
static void sccnxp_set_baud(struct uart_port *port, int baud) static int sccnxp_set_baud(struct uart_port *port, int baud)
{ {
struct sccnxp_port *s = dev_get_drvdata(port->dev); struct sccnxp_port *s = dev_get_drvdata(port->dev);
int div_std, tmp_baud, bestbaud = baud, besterr = -1; int div_std, tmp_baud, bestbaud = baud, besterr = -1;
...@@ -244,8 +244,11 @@ static void sccnxp_set_baud(struct uart_port *port, int baud) ...@@ -244,8 +244,11 @@ static void sccnxp_set_baud(struct uart_port *port, int baud)
sccnxp_port_write(port, SCCNXP_ACR_REG, acr | ACR_TIMER_MODE); sccnxp_port_write(port, SCCNXP_ACR_REG, acr | ACR_TIMER_MODE);
sccnxp_port_write(port, SCCNXP_CSR_REG, (csr << 4) | csr); sccnxp_port_write(port, SCCNXP_CSR_REG, (csr << 4) | csr);
if (baud != bestbaud)
dev_dbg(port->dev, "Baudrate desired: %i, calculated: %i\n", dev_dbg(port->dev, "Baudrate desired: %i, calculated: %i\n",
baud, bestbaud); baud, bestbaud);
return bestbaud;
} }
static void sccnxp_enable_irq(struct uart_port *port, int mask) static void sccnxp_enable_irq(struct uart_port *port, int mask)
...@@ -587,11 +590,14 @@ static void sccnxp_set_termios(struct uart_port *port, ...@@ -587,11 +590,14 @@ static void sccnxp_set_termios(struct uart_port *port,
baud = uart_get_baud_rate(port, termios, old, 50, baud = uart_get_baud_rate(port, termios, old, 50,
(s->flags & SCCNXP_HAVE_MR0) ? (s->flags & SCCNXP_HAVE_MR0) ?
230400 : 38400); 230400 : 38400);
sccnxp_set_baud(port, baud); baud = sccnxp_set_baud(port, baud);
/* Update timeout according to new baud rate */ /* Update timeout according to new baud rate */
uart_update_timeout(port, termios->c_cflag, baud); uart_update_timeout(port, termios->c_cflag, baud);
if (tty_termios_baud_rate(termios))
tty_termios_encode_baud_rate(termios, baud, baud);
/* Enable RX & TX */ /* Enable RX & TX */
sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_ENABLE | CR_TX_ENABLE); sccnxp_port_write(port, SCCNXP_CR_REG, CR_RX_ENABLE | CR_TX_ENABLE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册