[PATCH 4.14 162/173] earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon

From: Greg Kroah-Hartman
Date: Mon Sep 24 2018 - 08:25:33 EST


4.14-stable review patch. If anyone has any objections, please let me know.

------------------

From: Michal Simek <michal.simek@xxxxxxxxxx>

commit 182ead3e418a20328b73152b8e81fc8b4cac3b0b upstream.

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

[-stable comment: commit 31cb9a8575ca ("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 0ff3ab701963 ("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: 31cb9a8575ca ("earlycon: initialise baud field of earlycon device structure")
Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
Tested-by: Matt Redfearn <matt.redfearn@xxxxxxxx>
[rmilecki: add -stable comment and Fixes tag]
Signed-off-by: RafaÅ MiÅecki <rafal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/tty/serial/earlycon.c | 1 -
1 file changed, 1 deletion(-)

--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -254,7 +254,6 @@ int __init of_setup_earlycon(const struc
return -ENXIO;
}
port->mapbase = addr;
- port->uartclk = BASE_BAUD * 16;

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