Commit 850b37a7 authored by Ivan T. Ivanov's avatar Ivan T. Ivanov Committed by Greg Kroah-Hartman

tty: serial: msm: Remove 115.2 Kbps maximum baud rate limitation

UART controller is capable to perform transfers up to 4 Mbps.
Remove artificial 115.2 Kbps limitation.
Signed-off-by: default avatarIvan T. Ivanov <ivan.ivanov@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99693945
...@@ -882,6 +882,7 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud) ...@@ -882,6 +882,7 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud)
{ 3, 0xdd, 8 }, { 3, 0xdd, 8 },
{ 2, 0xee, 16 }, { 2, 0xee, 16 },
{ 1, 0xff, 31 }, { 1, 0xff, 31 },
{ 0, 0xff, 31 },
}; };
divisor = uart_get_divisor(port, baud); divisor = uart_get_divisor(port, baud);
...@@ -893,16 +894,29 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud) ...@@ -893,16 +894,29 @@ msm_find_best_baud(struct uart_port *port, unsigned int baud)
return entry; /* Default to smallest divider */ return entry; /* Default to smallest divider */
} }
static int 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 long *saved_flags)
{ {
unsigned int rxstale, watermark, mask; unsigned int rxstale, watermark, mask;
struct msm_port *msm_port = UART_TO_MSM(port); struct msm_port *msm_port = UART_TO_MSM(port);
const struct msm_baud_map *entry; const struct msm_baud_map *entry;
unsigned long flags;
entry = msm_find_best_baud(port, baud); entry = msm_find_best_baud(port, baud);
msm_write(port, entry->code, UART_CSR); msm_write(port, entry->code, UART_CSR);
if (baud > 460800)
port->uartclk = baud * 16;
flags = *saved_flags;
spin_unlock_irqrestore(&port->lock, flags);
clk_set_rate(msm_port->clk, port->uartclk);
spin_lock_irqsave(&port->lock, flags);
*saved_flags = flags;
/* RX stale watermark */ /* RX stale watermark */
rxstale = entry->rxstale; rxstale = entry->rxstale;
watermark = UART_IPR_STALE_LSB & rxstale; watermark = UART_IPR_STALE_LSB & rxstale;
...@@ -1026,8 +1040,8 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1026,8 +1040,8 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios,
msm_stop_dma(port, dma); msm_stop_dma(port, dma);
/* calculate and set baud rate */ /* calculate and set baud rate */
baud = uart_get_baud_rate(port, termios, old, 300, 115200); baud = uart_get_baud_rate(port, termios, old, 300, 4000000);
baud = msm_set_baud_rate(port, baud); baud = msm_set_baud_rate(port, baud, &flags);
if (tty_termios_baud_rate(termios)) if (tty_termios_baud_rate(termios))
tty_termios_encode_baud_rate(termios, baud, baud); tty_termios_encode_baud_rate(termios, baud, baud);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment