diff options
| author | Jonathan McDowell <noodles@earth.li> | 2006-08-14 23:05:32 -0700 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-10-01 17:07:06 +0100 |
| commit | 255341c6fded73204b1ee6feb5fe16e125b27f62 (patch) | |
| tree | 28727c6c6d0aa9c98ca3f902d62b8d4195a7e8a8 | |
| parent | 80e3c2b659515ef236f33f691ff5b22ae90ae8e4 (diff) | |
| download | linux-stable-255341c6fded73204b1ee6feb5fe16e125b27f62.tar.gz linux-stable-255341c6fded73204b1ee6feb5fe16e125b27f62.tar.bz2 linux-stable-255341c6fded73204b1ee6feb5fe16e125b27f62.zip | |
[SERIAL] OMAP1510 serial fix for 115200 baud
The patch below is necessary for 115200 baud on an OMAP1510 internal UART.
It's been in the linux-omap tree for some time and with it applied to a
vanilla Linus git tree the serial console on the Amstrad Delta (which is
OMAP1510 based and whose initial bootloader runs at 115200) works fine (it
doesn't without it).
Signed-off-by: Jonathan McDowell <noodles@earth.li>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/serial/8250.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index cef03e68771b..a07442ffefbd 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -1896,6 +1896,17 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios, serial_outp(up, UART_EFR, efr); } +#ifdef CONFIG_ARCH_OMAP15XX + /* Workaround to enable 115200 baud on OMAP1510 internal ports */ + if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) { + if (baud == 115200) { + quot = 1; + serial_out(up, UART_OMAP_OSC_12M_SEL, 1); + } else + serial_out(up, UART_OMAP_OSC_12M_SEL, 0); + } +#endif + if (up->capabilities & UART_NATSEMI) { /* Switch to bank 2 not bank 1, to avoid resetting EXCR2 */ serial_outp(up, UART_LCR, 0xe0); |