diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-10 17:44:39 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 17:44:39 (GMT) |
commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /drivers/serial | |
parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
download | linux-fsl-qoriq-67b738ef32df7ec429004866d2a739a3775894d2.tar.xz |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/8250.c | 2 | ||||
-rw-r--r-- | drivers/serial/mfd.c | 24 |
2 files changed, 9 insertions, 17 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index aaf9907..ee74c93 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -2872,7 +2872,7 @@ static struct console serial8250_console = { .device = uart_console_device, .setup = serial8250_console_setup, .early_setup = serial8250_console_early_setup, - .flags = CON_PRINTBUFFER, + .flags = CON_PRINTBUFFER | CON_ANYTIME, .index = -1, .data = &serial8250_reg, }; diff --git a/drivers/serial/mfd.c b/drivers/serial/mfd.c index 5fc699e..d40010a 100644 --- a/drivers/serial/mfd.c +++ b/drivers/serial/mfd.c @@ -900,8 +900,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, unsigned char cval, fcr = 0; unsigned long flags; unsigned int baud, quot; - u32 mul = 0x3600; - u32 ps = 0x10; + u32 ps, mul; switch (termios->c_cflag & CSIZE) { case CS5: @@ -943,31 +942,24 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, baud = uart_get_baud_rate(port, termios, old, 0, 4000000); quot = 1; + ps = 0x10; + mul = 0x3600; switch (baud) { case 3500000: mul = 0x3345; ps = 0xC; break; - case 3000000: - mul = 0x2EE0; - break; - case 2500000: - mul = 0x2710; - break; - case 2000000: - mul = 0x1F40; - break; case 1843200: mul = 0x2400; break; + case 3000000: + case 2500000: + case 2000000: case 1500000: - mul = 0x1770; - break; case 1000000: - mul = 0xFA0; - break; case 500000: - mul = 0x7D0; + /* mul/ps/quot = 0x9C4/0x10/0x1 will make a 500000 bps */ + mul = baud / 500000 * 0x9C4; break; default: /* Use uart_get_divisor to get quot for other baud rates */ |