]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon
authorMichal Simek <michal.simek@xilinx.com>
Wed, 25 Apr 2018 13:48:42 +0000 (15:48 +0200)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:49:31 +0000 (19:49 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836117
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@xilinx.com>
Tested-by: Matt Redfearn <matt.redfearn@mips.com>
[rmilecki: add -stable comment and Fixes tag]
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/tty/serial/earlycon.c

index 23994ceb116dfe4e61e7d6f468b0e28d9ebaef53..24a1febc05b653332f2d8a0d707719d1d9b91452 100644 (file)
@@ -251,7 +251,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)