From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3308147-1523479043-2-6350542256381791877 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523479042; b=IV2wyic7GMesVRWJ9WIjcAMwmq2RjNDE6bmd/wmIsQFpCP6GMH zgzlsM3YwY/zjf25dUfk32RsXlabHeUi4Excntyc6AK2Xb1tFNMMfeCS8zz+ceGx /nEAKqa7EnVqIKP2yKSVOEZ8PRtGJCH3rUuDbagw5gjzHlN6Dn70l9lrcQxprYdD hMJ/yU4u+P/sxE4H0Y5gL+f2yLa1qmLU/1Q8K45UNGXcz+2MhjcL7/glhWOOK26r pBYOBJ989JPekat5RQZ+BxkO/dEkfUyt34J3Kk4/Iytug7oXbD+cKXQa0DtVUoSd ckhZ8wefJ3hz8i0xKacLu9lovgCcNqor2Ktg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523479042; bh=N3DOG+fR5+4NAUglMofeczawnOeJcT Y2bqZndyCptug=; b=HZYSU6fCHBsUhzhMQebrO8B8jlUJYlbBxLs624k4QBeOtq nl4gUp057dPZTtSoX1PMQmwIb+caqIIIjEIqS0okNXhU/yyPHDOvIfShbzLL18q2 jO+nzCQK533hB2M9x0MiVkYeGRDXSdaoH1/X69zWu8fI1KGGFAhbC6egKpUBd96h 4zPPYkFICaZV7VBXoHGgQB7z7W8bl9FOE2DGBkVAq3VE9gPh2w+vFZpwWpxsNHjO YpnqX6zWgnPkZWztL4V/2g4D2+oljgsiYOqWNZs39iHp4wtuDfyr8LhEXtzGmBRW BlGV0K6VMoQSxunWtWiP1f7QD5iNXfQHL0TuKsUQ== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfMMN2rcZflYGpYEzFyLRgmt8SApYlAcwyjmjz91Sv6+gWpHuWBfpqYshewTCbE92Uz+GXHosKeKJCElXHE+LHSBeM9VCmq7TbS5z8wL0n39euE1XKywF l77ZUsjb4iP+Ui8O8M4Iu9vss17nxbUjLpxZ5IAzO53UUUmFwkt5srbokJUXWISWpOiIAxVx0Ozk3LvSZSY5EmV/2MgUWb1zzIfLi/1ycqhL8IuxrUQMZju9 X-CM-Analysis: v=2.3 cv=Tq3Iegfh c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=PHq6YzTAAAAA:8 a=ag1SF4gXAAAA:8 a=yMhMjlubAAAA:8 a=QPzaX5DZGYNi95dB0RoA:9 a=QEXdDO2ut3YA:10 a=ZKzU8r6zoKMcqsNulkmm:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756098AbeDKSsf (ORCPT ); Wed, 11 Apr 2018 14:48:35 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59686 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756096AbeDKSsc (ORCPT ); Wed, 11 Apr 2018 14:48:32 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King - ARM Linux , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.4 115/190] Fix serial console on SNI RM400 machines Date: Wed, 11 Apr 2018 20:36:01 +0200 Message-Id: <20180411183557.834541973@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Bogendoerfer [ Upstream commit e279e6d98e0cf2c2fe008b3c29042b92f0e17b1d ] sccnxp driver doesn't get the correct uart clock rate, if CONFIG_HAVE_CLOCK is disabled. Correct usage of clk API to make it work with/without it. Fixes: 90efa75f7ab0 (serial: sccnxp: Using CLK API for getting UART clock) Suggested-by: Russell King - ARM Linux Signed-off-by: Thomas Bogendoerfer Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/sccnxp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -884,14 +884,19 @@ static int sccnxp_probe(struct platform_ clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { - if (PTR_ERR(clk) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; + ret = PTR_ERR(clk); + if (ret == -EPROBE_DEFER) goto err_out; - } + uartclk = 0; + } else { + clk_prepare_enable(clk); + uartclk = clk_get_rate(clk); + } + + if (!uartclk) { dev_notice(&pdev->dev, "Using default clock frequency\n"); uartclk = s->chip->freq_std; - } else - uartclk = clk_get_rate(clk); + } /* Check input frequency */ if ((uartclk < s->chip->freq_min) || (uartclk > s->chip->freq_max)) {