Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df57cf6a authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

serial: mxs-auart: fix baud rate range 



Currently mxs-auart doesn't care correctly about the baud rate divisor.
According to reference manual the baud rate divisor must be between
0x000000EC and 0x003FFFC0. So calculate the possible baud rate range
and use it for uart_get_baud_rate().

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17dc72cf

drivers/tty/serial/mxs-auart.c

+6 −2
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ 
#define AUART_CTRL2_TXE				(1 << 8)

#define AUART_CTRL2_UARTEN			(1 << 0)



#define AUART_LINECTRL_BAUD_DIV_MAX		0x003fffc0

#define AUART_LINECTRL_BAUD_DIV_MIN		0x000000ec

#define AUART_LINECTRL_BAUD_DIVINT_SHIFT	16

#define AUART_LINECTRL_BAUD_DIVINT_MASK		0xffff0000

#define AUART_LINECTRL_BAUD_DIVINT(v)		(((v) & 0xffff) << 16)
@@ -659,7 +661,7 @@ static void mxs_auart_settermios(struct uart_port *u, 
{

	struct mxs_auart_port *s = to_auart_port(u);

	u32 bm, ctrl, ctrl2, div;

	unsigned int cflag, baud;

	unsigned int cflag, baud, baud_min, baud_max;



	cflag = termios->c_cflag;
@@ -752,7 +754,9 @@ static void mxs_auart_settermios(struct uart_port *u, 
	}



	/* set baud rate */

	baud = uart_get_baud_rate(u, termios, old, 0, u->uartclk);

	baud_min = DIV_ROUND_UP(u->uartclk * 32, AUART_LINECTRL_BAUD_DIV_MAX);

	baud_max = u->uartclk * 32 / AUART_LINECTRL_BAUD_DIV_MIN;

	baud = uart_get_baud_rate(u, termios, old, baud_min, baud_max);

	div = u->uartclk * 32 / baud;

	ctrl |= AUART_LINECTRL_BAUD_DIVFRAC(div & 0x3F);

	ctrl |= AUART_LINECTRL_BAUD_DIVINT(div >> 6);