diff options
author | Robin Getz <rgetz@blackfin.uclinux.org> | 2009-06-11 08:38:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:51:04 -0400 |
commit | 7de7c55bf54dede2bd2262349fc7b558bcc8e413 (patch) | |
tree | 5057192ceb6b5ce0e6323db32939389585484d6a | |
parent | 8516c568f25666a012ec4c859e640a76fc9b6ec0 (diff) |
Blackfin Serial Driver: fix baudrate for early_printk
Since we already setup the early console UART in
arch/blackfin/kernel/early_printk.c, and common functions which are
enabled from the .setup will override the proper settings later, don't
fill in these structures. Otherwise we get mangled baudrate settings when
using early_printk.
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/serial/bfin_5xx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index 65a4c07f6199..dfae22d47bf7 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
@@ -1272,12 +1272,17 @@ static __init void early_serial_write(struct console *con, const char *s, | |||
1272 | } | 1272 | } |
1273 | } | 1273 | } |
1274 | 1274 | ||
1275 | /* | ||
1276 | * This should have a .setup or .early_setup in it, but then things get called | ||
1277 | * without the command line options, and the baud rate gets messed up - so | ||
1278 | * don't let the common infrastructure play with things. (see calls to setup | ||
1279 | * & earlysetup in ./kernel/printk.c:register_console() | ||
1280 | */ | ||
1275 | static struct __initdata console bfin_early_serial_console = { | 1281 | static struct __initdata console bfin_early_serial_console = { |
1276 | .name = "early_BFuart", | 1282 | .name = "early_BFuart", |
1277 | .write = early_serial_write, | 1283 | .write = early_serial_write, |
1278 | .device = uart_console_device, | 1284 | .device = uart_console_device, |
1279 | .flags = CON_PRINTBUFFER, | 1285 | .flags = CON_PRINTBUFFER, |
1280 | .setup = bfin_serial_console_setup, | ||
1281 | .index = -1, | 1286 | .index = -1, |
1282 | .data = &bfin_serial_reg, | 1287 | .data = &bfin_serial_reg, |
1283 | }; | 1288 | }; |