summaryrefslogtreecommitdiffstats
path: root/drivers/serial/bfin_5xx.c
diff options
context:
space:
mode:
authorRobin Getz <rgetz@blackfin.uclinux.org>2009-06-11 13:38:57 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 08:51:04 -0700
commit7de7c55bf54dede2bd2262349fc7b558bcc8e413 (patch)
tree5057192ceb6b5ce0e6323db32939389585484d6a /drivers/serial/bfin_5xx.c
parent8516c568f25666a012ec4c859e640a76fc9b6ec0 (diff)
downloadblackbird-op-linux-7de7c55bf54dede2bd2262349fc7b558bcc8e413.tar.gz
blackbird-op-linux-7de7c55bf54dede2bd2262349fc7b558bcc8e413.zip
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>
Diffstat (limited to 'drivers/serial/bfin_5xx.c')
-rw-r--r--drivers/serial/bfin_5xx.c7
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,
}
}
+/*
+ * This should have a .setup or .early_setup in it, but then things get called
+ * without the command line options, and the baud rate gets messed up - so
+ * don't let the common infrastructure play with things. (see calls to setup
+ * & earlysetup in ./kernel/printk.c:register_console()
+ */
static struct __initdata console bfin_early_serial_console = {
.name = "early_BFuart",
.write = early_serial_write,
.device = uart_console_device,
.flags = CON_PRINTBUFFER,
- .setup = bfin_serial_console_setup,
.index = -1,
.data = &bfin_serial_reg,
};
OpenPOWER on IntegriCloud