From patchwork Tue Feb 26 19:36:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10831449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46AF213B5 for ; Wed, 27 Feb 2019 08:57:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31CFE2B002 for ; Wed, 27 Feb 2019 08:57:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 263672C162; Wed, 27 Feb 2019 08:57:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C1B512B002 for ; Wed, 27 Feb 2019 08:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BE906E075; Wed, 27 Feb 2019 08:56:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 691656E01B for ; Tue, 26 Feb 2019 19:36:37 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id e17so4636910pgd.2 for ; Tue, 26 Feb 2019 11:36:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m4Hu2QCxn5OJqL1KMoylJ0W+atiXbfqxwE6Hc3/RGaw=; b=Mav2RsERluMKFyztra0HNpvtGH+4eP13lpU7+tOHUyJXGNplmtfXk0PD9jLhSeVyaZ /WGXnOtnVVYh+5oPc/X5W4DvEeP8hnvnih7JK/Jkp96MOob+RxM+PJjj7MaP4jueKDA1 mpOJ6ZgxDaweuLVfMgFmmWyFbXRZxLpkr1onc/6R10cQjQ6D4rDGiy7YWLchn6oog8Ai +064C6ktteKZGM7H5fP0NCwzrnY8fn0oS/vabBWagwkMblYjz7n+P/t0/allJ1tdK0GH NFthhsuMiaHsJZ2GbsGnvtBJVkrSVtEWSH8dcyn5DWvrxm1qofD94iHsSYQhBZMAOHeG LfFg== X-Gm-Message-State: AHQUAuanQcgnhUf4hYBPeFdbnbz4pwGf4e7QtG564ZYQZCpZ3q8HCAaw Phyyf7CcaC7mrp8/5SQeaJVZxTrP2Ok= X-Google-Smtp-Source: AHgI3IYtiTLTnf+zj4rKJMXXVIDYPI9YK5bYIkGS+meZTL0TxS0EELNwCTVyKmQ+G1gqB5bovQ4UiA== X-Received: by 2002:a63:31c8:: with SMTP id x191mr421627pgx.99.1551209796570; Tue, 26 Feb 2019 11:36:36 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id l79sm28951220pfb.102.2019.02.26.11.36.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Feb 2019 11:36:35 -0800 (PST) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH 7/9] drm/bridge: tc358767: Introduce tc_set_syspllparam() Date: Tue, 26 Feb 2019 11:36:07 -0800 Message-Id: <20190226193609.9862-8-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226193609.9862-1-andrew.smirnov@gmail.com> References: <20190226193609.9862-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 27 Feb 2019 08:56:29 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m4Hu2QCxn5OJqL1KMoylJ0W+atiXbfqxwE6Hc3/RGaw=; b=dlagRZnF4HIVuvNrb144ZDWe+YXbLIhJYz96nvGlaG9IoBQscKI6pgbqce5LBceYs9 xulSNH84l4EDPSxuj+pXOxM1KzT9J/Q4pYFLTXFKHLAka5dXfUCb1p8VimWjYznNcfz2 5joW6bCLNY/t62V2xsAvipbS1bgcmgouytshHOMBNmERqKpHEDywkcpgR1GLNE8ew3EB R++u6GAZp68AVE6jBpQXELoUZCQokaN05uO10bzWKI6td2/gzoaoR3OWxvYeMngtXVsB KoDSkodnKYIKmHKRzQAnjj7F1XmyaNmOwEgq0OytOeDdGxzCOkna0zaME1FplyCHwcWg 37fQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , linux-kernel@vger.kernel.org, Laurent Pinchart , Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move common code converting clock rate to an appropriate constant and configuring SYS_PLLPARAM register into a separate routine and convert the rest of the code to use it. No functional change intended. Signed-off-by: Andrey Smirnov Cc: Archit Taneja Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/bridge/tc358767.c | 50 +++++++++++++------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 54ff95f66e30..227f14cd2d3d 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -522,35 +522,42 @@ static int tc_stream_clock_calc(struct tc_data *tc) return regmap_write(tc->regmap, DP0_VIDMNGEN1, 32768); } -static int tc_aux_link_setup(struct tc_data *tc) +static int tc_set_syspllparam(struct tc_data *tc) { unsigned long rate; - u32 value; - int ret; - u32 dp_phy_ctrl; + u32 pllparam = SYSCLK_SEL_LSCLK | LSCLK_DIV_2; rate = clk_get_rate(tc->refclk); switch (rate) { case 38400000: - value = REF_FREQ_38M4; + pllparam |= REF_FREQ_38M4; break; case 26000000: - value = REF_FREQ_26M; + pllparam |= REF_FREQ_26M; break; case 19200000: - value = REF_FREQ_19M2; + pllparam |= REF_FREQ_19M2; break; case 13000000: - value = REF_FREQ_13M; + pllparam |= REF_FREQ_13M; break; default: dev_err(tc->dev, "Invalid refclk rate: %lu Hz\n", rate); return -EINVAL; } + return regmap_write(tc->regmap, SYS_PLLPARAM, pllparam); +} + +static int tc_aux_link_setup(struct tc_data *tc) +{ + int ret; + u32 dp_phy_ctrl; + /* Setup DP-PHY / PLL */ - value |= SYSCLK_SEL_LSCLK | LSCLK_DIV_2; - tc_write(SYS_PLLPARAM, value); + ret = tc_set_syspllparam(tc); + if (ret) + return ret; dp_phy_ctrl = BGREN | PWR_SW_EN | PHY_A0_EN; if (tc->link.base.num_lanes == 2) @@ -811,7 +818,6 @@ static int tc_main_link_setup(struct tc_data *tc) { struct drm_dp_aux *aux = &tc->aux; struct device *dev = tc->dev; - unsigned int rate; u32 dp_phy_ctrl; int timeout; u32 value; @@ -828,25 +834,9 @@ static int tc_main_link_setup(struct tc_data *tc) (tc->link.spread ? DP0_SRCCTRL_SSCG : 0) | ((tc->link.base.rate != 162000) ? DP0_SRCCTRL_BW27 : 0)); - rate = clk_get_rate(tc->refclk); - switch (rate) { - case 38400000: - value = REF_FREQ_38M4; - break; - case 26000000: - value = REF_FREQ_26M; - break; - case 19200000: - value = REF_FREQ_19M2; - break; - case 13000000: - value = REF_FREQ_13M; - break; - default: - return -EINVAL; - } - value |= SYSCLK_SEL_LSCLK | LSCLK_DIV_2; - tc_write(SYS_PLLPARAM, value); + ret = tc_set_syspllparam(tc); + if (ret) + return ret; /* Setup Main Link */ dp_phy_ctrl = BGREN | PWR_SW_EN | PHY_A0_EN | PHY_M0_EN;