Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de7c55b authored by Robin Getz's avatar Robin Getz Committed by Linus Torvalds
Browse files

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: default avatarRobin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8516c568

drivers/serial/bfin_5xx.c

+6 −1
Original line number Diff line number Diff line
@@ -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,

};