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

Commit 5e8bf9f2 authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman
Browse files

earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon 



commit 182ead3e upstream.

There is no reason to initialize uartclk to BASE_BAUD * 16 for DT based
systems.

[-stable comment: commit 31cb9a85 ("earlycon: initialise baud field
 of earlycon device structure") has changed 8250_early.c behavior which
 now tries to setup UART speed.
 Already-backported upstream commit 0ff3ab70 ("serial:  8250_early:
 Only set divisor if valid clk & baud") handles properly uartclk not
 being set but it still requires backporting fix for wrong uartclk val.
 This fixes malformed early console output on arch-es with BASE_BAUD.]

Fixes: 31cb9a85 ("earlycon: initialise baud field of earlycon device structure")
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Tested-by: default avatarMatt Redfearn <matt.redfearn@mips.com>
[rmilecki: add -stable comment and Fixes tag]
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a44d267a

drivers/tty/serial/earlycon.c

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ int __init of_setup_earlycon(const struct earlycon_id *match, 
		return -ENXIO;

	}

	port->mapbase = addr;

	port->uartclk = BASE_BAUD * 16;



	val = of_get_flat_dt_prop(node, "reg-offset", NULL);

	if (val)