From 44da59e4006fbf7c4cc9b54485a37a40726091ee Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 22 Jun 2009 18:43:18 +0100 Subject: msm: fixups to match current code The tty layer is now a bit more fussy about reporting the right baud rate back. Make the msm driver match the current state of affairs. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/serial/msm_serial.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'drivers/serial') diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c index 1a7c856f76f..698048f64f5 100644 --- a/drivers/serial/msm_serial.c +++ b/drivers/serial/msm_serial.c @@ -229,7 +229,7 @@ static void msm_break_ctl(struct uart_port *port, int break_ctl) msm_write(port, UART_CR_CMD_STOP_BREAK, UART_CR); } -static void msm_set_baud_rate(struct uart_port *port, unsigned int baud) +static int msm_set_baud_rate(struct uart_port *port, unsigned int baud) { unsigned int baud_code, rxstale, watermark; @@ -281,6 +281,7 @@ static void msm_set_baud_rate(struct uart_port *port, unsigned int baud) case 115200: default: baud_code = UART_CSR_115200; + baud = 115200; rxstale = 31; break; } @@ -299,6 +300,8 @@ static void msm_set_baud_rate(struct uart_port *port, unsigned int baud) /* set TX watermark */ msm_write(port, 10, UART_TFWR); + + return baud; } static void msm_reset(struct uart_port *port) @@ -395,8 +398,10 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios, /* calculate and set baud rate */ baud = uart_get_baud_rate(port, termios, old, 300, 115200); - msm_set_baud_rate(port, baud); - + baud = msm_set_baud_rate(port, baud); + if (tty_termios_baud_rate(termios)) + tty_termios_encode_baud_rate(termios, baud, baud); + /* calculate parity */ mr = msm_read(port, UART_MR2); mr &= ~UART_MR2_PARITY_MODE; -- cgit v1.2.3-18-g5258