git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From 182ead3e418a20328b73152b8e81fc8b4cac3b0b Mon Sep 17 00:00:00 2001
   2 From: Michal Simek <michal.simek@xilinx.com>
   3 Date: Wed, 25 Apr 2018 15:48:42 +0200
   4 Subject: earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon
   5
   6 From: Michal Simek <michal.simek@xilinx.com>
   7
   8 commit 182ead3e418a20328b73152b8e81fc8b4cac3b0b upstream.
   9
  10 There is no reason to initialize uartclk to BASE_BAUD * 16 for DT based
  11 systems.
  12
  13 [-stable comment: commit 31cb9a8575ca ("earlycon: initialise baud field
  14  of earlycon device structure") has changed 8250_early.c behavior which
  15  now tries to setup UART speed.
  16  Already-backported upstream commit 0ff3ab701963 ("serial:  8250_early:
  17  Only set divisor if valid clk & baud") handles properly uartclk not
  18  being set but it still requires backporting fix for wrong uartclk val.
  19  This fixes malformed early console output on arch-es with BASE_BAUD.]
  20
  21 Fixes: 31cb9a8575ca ("earlycon: initialise baud field of earlycon device structure")
  22 Signed-off-by: Michal Simek <michal.simek@xilinx.com>
  23 Tested-by: Matt Redfearn <matt.redfearn@mips.com>
  24 [rmilecki: add -stable comment and Fixes tag]
  25 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27 ---
  28  drivers/tty/serial/earlycon.c |    1 -
  29  1 file changed, 1 deletion(-)
  30
  31 --- a/drivers/tty/serial/earlycon.c
  32 +++ b/drivers/tty/serial/earlycon.c
  33 @@ -254,7 +254,6 @@ int __init of_setup_earlycon(const struc
  34                 return -ENXIO;
  35         }
  36         port->mapbase = addr;
  37 -       port->uartclk = BASE_BAUD * 16;
  38
  39         val = of_get_flat_dt_prop(node, "reg-offset", NULL);
  40         if (val)