aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/earlycon.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-06-12 12:52:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 13:07:26 -0700
commit60efcf0414be5876d81276e3c1fd12680ba2ce71 (patch)
treed3b9e6b9ed831137a8a326562855f444841e35c7 /drivers/tty/serial/earlycon.c
parenttty: Correct INPCK handling (diff)
downloadlinux-dev-60efcf0414be5876d81276e3c1fd12680ba2ce71.tar.xz
linux-dev-60efcf0414be5876d81276e3c1fd12680ba2ce71.zip
tty/serial: fix 8250 early console option passing to regular console
In the conversion to generic early console, the passing of options from the early 8250 console to the regular ttyS console was broken. This resulted in the baud rate changing when switching consoles during boot. This feature allows specifying a single console option on the kernel command line rather than both an early console and regular serial tty console. It would be nice to generalize this feature. However, it only works if the correct baud rate can be probed early which is not the case on many platforms which have non-standard UART clock rates. So for now, this is left as an 8250 specific feature. Reported-and-tested-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Rob Herring <robh@kernel.org> Cc: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/earlycon.c')
-rw-r--r--drivers/tty/serial/earlycon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 5131b5ee6164..a514ee6f5406 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -25,7 +25,7 @@
#include <asm/serial.h>
static struct console early_con = {
- .name = "earlycon",
+ .name = "uart", /* 8250 console switch requires this name */
.flags = CON_PRINTBUFFER | CON_BOOT,
.index = -1,
};