From patchwork Tue Feb 26 19:36:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10831439 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 245861390 for ; Wed, 27 Feb 2019 08:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FE092B002 for ; Wed, 27 Feb 2019 08:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 044152C162; Wed, 27 Feb 2019 08:57:03 +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 00F3E2B002 for ; Wed, 27 Feb 2019 08:57:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F2B8C6E06A; Wed, 27 Feb 2019 08:56:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id CEC096E024 for ; Tue, 26 Feb 2019 19:36:38 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id i19so6737012pfd.0 for ; Tue, 26 Feb 2019 11:36:38 -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=RGzhHRXCSSTUV8y9+sZJ9O8fW6lSd15+7S2lT8PZLKA=; b=bmL6sOKdL182JO5QYImV3eEGBGPOjtpn94ffvlH+TF5Rl90GhDwGuJm6rThK3O8e9v GMEaX92UUaCm+OFw9iSqIDmjeOvnOjDhW8c+a51plemFyyv/nQ3DS+Hf8DzxYknCuX52 ADalWaIJ6nnxfkMSRmMDF+tTnS5YDZy7gsvmTtbWNyitOH1U8/x6tMnsxgUIB2oVAr/o RBWZ6RCu0h/10wp/Y2ctXL7XJFw79OR2A66nY5eoHD1moUjXEWvmNID4iQFQdoTHqRGl 3sCCks/KF4k8fd3kac4VmseDz4rY8JzBRJyvSTFen3OFrEM45Buga0T9M3BLXMjBeMcZ eJLQ== X-Gm-Message-State: AHQUAuYlah83FgU3Vp7AkuUMUwrrhrmfIVvYa+41Pa9fGn1wruHparRK E2IqcchyZw5Y/AXyTlnvU/KzWXI6q8E= X-Google-Smtp-Source: AHgI3IYBKXd+WcIOttjJ2/AqPrDDfdXeAWYSdT7lTdKZeN63pE1l21nX8QLdWskyqKN7gIry08xFUA== X-Received: by 2002:a63:8942:: with SMTP id v63mr25177689pgd.406.1551209798004; Tue, 26 Feb 2019 11:36:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Feb 2019 11:36:37 -0800 (PST) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH 8/9] drm/bridge: tc358767: Introduce tc_pllupdate_pllen() Date: Tue, 26 Feb 2019 11:36:08 -0800 Message-Id: <20190226193609.9862-9-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=RGzhHRXCSSTUV8y9+sZJ9O8fW6lSd15+7S2lT8PZLKA=; b=oVsb9oQLiw7fuySZNvlTxYC1ZehjkTc/1qbDebFX0OVzzj1lDRVZYVj/hVcKlX2UgJ 6RiYPPmIM4CxFqs23wm6SwGZXpVFGvgffu6sCZCP3yTHs3pUefaHP1YSTD4BMop17Y37 S185yh8XgT4Ucv6nhw6jK7Q5uygOunVf16nDnp60gGvwVFK9Z1y8Ct9HvB8DNzHruGwJ zjx+8ecwX0piZrihN/7y4y/C9IWiy7qoo0VNO/7jr5mMz/Ewiyg4hcXjUFG2vkuy1qPf SfF9aFi8PphRz4iz+6IbaR7Qh/TZQkLf6B1LJY1bgfurGFXhC4nd/9nc5lE0T+eFy/vC lx5g== 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 Tc_wait_pll_lock() is always called as a follow-up for updating PLLUPDATE and PLLEN bit of a given PLL control register. To simplify things, merge the two operation into a single helper function tc_pllupdate_pllen() 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 | 36 +++++++++++++++++++------------ 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 227f14cd2d3d..239b3aaa255d 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -390,10 +390,18 @@ static u32 tc_srcctrl(struct tc_data *tc) return reg; } -static void tc_wait_pll_lock(struct tc_data *tc) +static int tc_pllupdate_pllen(struct tc_data *tc, unsigned int pllctrl) { + int ret; + + ret = regmap_write(tc->regmap, pllctrl, PLLUPDATE | PLLEN); + if (ret) + return ret; + /* Wait for PLL to lock: up to 2.09 ms, depending on refclk */ usleep_range(3000, 6000); + + return 0; } static int tc_pxl_pll_en(struct tc_data *tc, u32 refclk, u32 pixelclock) @@ -487,11 +495,7 @@ static int tc_pxl_pll_en(struct tc_data *tc, u32 refclk, u32 pixelclock) (best_mul << 0)); /* Multiplier for PLL */ /* Force PLL parameter update and disable bypass */ - tc_write(PXL_PLLCTRL, PLLUPDATE | PLLEN); - - tc_wait_pll_lock(tc); - - return 0; + return tc_pllupdate_pllen(tc, PXL_PLLCTRL); err: return ret; } @@ -568,11 +572,13 @@ static int tc_aux_link_setup(struct tc_data *tc) * Initially PLLs are in bypass. Force PLL parameter update, * disable PLL bypass, enable PLL */ - tc_write(DP0_PLLCTRL, PLLUPDATE | PLLEN); - tc_wait_pll_lock(tc); + ret = tc_pllupdate_pllen(tc, DP0_PLLCTRL); + if (ret) + return ret; - tc_write(DP1_PLLCTRL, PLLUPDATE | PLLEN); - tc_wait_pll_lock(tc); + ret = tc_pllupdate_pllen(tc, DP1_PLLCTRL); + if (ret) + return ret; ret = tc_poll_timeout(tc->regmap, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1, 1000); @@ -846,11 +852,13 @@ static int tc_main_link_setup(struct tc_data *tc) msleep(100); /* PLL setup */ - tc_write(DP0_PLLCTRL, PLLUPDATE | PLLEN); - tc_wait_pll_lock(tc); + ret = tc_pllupdate_pllen(tc, DP0_PLLCTRL); + if (ret) + return ret; - tc_write(DP1_PLLCTRL, PLLUPDATE | PLLEN); - tc_wait_pll_lock(tc); + ret = tc_pllupdate_pllen(tc, DP1_PLLCTRL); + if (ret) + return ret; /* PXL PLL setup */ if (tc_test_pattern) {