From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f67.google.com ([209.85.167.67]:37817 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725741AbeIXEeQ (ORCPT ); Mon, 24 Sep 2018 00:34:16 -0400 Received: by mail-lf1-f67.google.com with SMTP id b12-v6so7755338lfa.4 for ; Sun, 23 Sep 2018 15:35:03 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: stable@vger.kernel.org Cc: Michal Simek , Greg Kroah-Hartman , Jiri Slaby , Russell King , Hauke Mehrtens , bcm-kernel-feedback-list , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 4.14-4.17 2/2] earlycon: Remove hardcoded port->uartclk initialization in of_setup_earlycon Date: Mon, 24 Sep 2018 00:34:46 +0200 Message-Id: <20180923223446.3773-2-zajec5@gmail.com> In-Reply-To: <20180923223446.3773-1-zajec5@gmail.com> References: <20180923223446.3773-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: From: Michal Simek 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 Tested-by: Matt Redfearn Signed-off-by: Greg Kroah-Hartman [rmilecki: add -stable comment and Fixes tag] Signed-off-by: Rafał Miłecki --- drivers/tty/serial/earlycon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 05ba1875bb3e..7b0a3a1688e8 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -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) -- 2.13.7