From patchwork Fri Mar 22 03:28:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10867699 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 1D05C1390 for ; Sun, 24 Mar 2019 21:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B69B284A5 for ; Sun, 24 Mar 2019 21:04:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3AC828A94; Sun, 24 Mar 2019 21:04:17 +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 B3A51284A5 for ; Sun, 24 Mar 2019 21:04:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F15A6E613; Sun, 24 Mar 2019 21:03:28 +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 9C8746E238 for ; Fri, 22 Mar 2019 03:29:31 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id a22so473622pgg.13 for ; Thu, 21 Mar 2019 20:29:31 -0700 (PDT) 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=xgrTJQtYJ1/aH4LpCAiSuAxdXzKMohH0iux2BQdEBug=; b=IR/MY8sJxtviodcmTj0puSGZf9gZMNPw2P1l4w9db70/Ki8Cf7wper04gjm7Ii6QsD nMPK2AF34hwRjuQ0gJviZXGKTc1nYk/wI0WgyJsF5CHXaS8Ymq6vGtLWOBkdNEbFpElL 6Dg2fT9et06mqQRY5WDMQVaojIdAIJzqkdmGiJ7rzrgur9FPcJLgDDbqZZfnFfghYNp3 ycT+hnAMSYe3RUuNVMcRJZUij2dbYm/okT4nzGsbh0xmdb3zvsbqpo/z9siFuhFt0v3x 6VnVKUHUrLoCpLzIxliD+nVknjAubefa7Pa3go/6vqw/PFIdc18Y8TUlX6dsJUHz2aa2 aKZg== X-Gm-Message-State: APjAAAVaq6RrYhmL8BfE6OZL80EWfCdedGfYvXFSXYIMzKiDb7yVtZH5 EXTY7RdMTnIceBJFh0Kcf+J1BKGqQZw= X-Google-Smtp-Source: APXvYqzPnGZiimk2onzvBJyUA/WOTswBZDqDHnwlKF4cQApQwbuHELjdvxG9aN82b3GFKbJUWf0XJg== X-Received: by 2002:a63:f544:: with SMTP id e4mr6773018pgk.145.1553225370827; Thu, 21 Mar 2019 20:29:30 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id o76sm16154476pfa.156.2019.03.21.20.29.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 20:29:30 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 12/15] drm/bridge: tc358767: Introduce tc_pllupdate_pllen() Date: Thu, 21 Mar 2019 20:28:58 -0700 Message-Id: <20190322032901.12045-13-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190322032901.12045-1-andrew.smirnov@gmail.com> References: <20190322032901.12045-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 24 Mar 2019 21:01:58 +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=xgrTJQtYJ1/aH4LpCAiSuAxdXzKMohH0iux2BQdEBug=; b=i7yFMsfyCuMTnPdoR87/xpAEM2URtLQqTHeIYQzc3S2cuXZQG6EGXTZF44Tj2aMiPV Jy4DBPCzutSqX3OlTHqwH3BDqNMOZYL9tvqvXIRob/UJLbYaSUx6Kir9n+wHM8r0LFdC CcI+YQWI2fX1Gs2cKByWXfehZwD0XdYcwNtsQf6zcWTUFhi5n6U8Dgv8sFj7sCa6lFSu qAGA+mIVb2UtoOb8T0I8/REWtDPyS8s6EzWOGtjftDLsuKQlMM6NNFve+g034YW8e8VV zBs5Ec5XJbmEQiHJyM6Jlo8t9RJ4IT1i8xk3FpmWn9BUgZJyORMb1oCV51mW0Kr2KC5p fdaw== 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 , Andrey Gusakov , linux-kernel@vger.kernel.org, Tomi Valkeinen , 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 Reviewed-by: Laurent Pinchart Cc: Archit Taneja Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Andrey Gusakov Cc: Philipp Zabel Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 32 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 976a9861e537..f66a1c4a2047 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -447,10 +447,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) @@ -550,13 +558,7 @@ static int tc_pxl_pll_en(struct tc_data *tc, u32 refclk, u32 pixelclock) return ret; /* Force PLL parameter update and disable bypass */ - ret = regmap_write(tc->regmap, PXL_PLLCTRL, PLLUPDATE | PLLEN); - if (ret) - return ret; - - tc_wait_pll_lock(tc); - - return 0; + return tc_pllupdate_pllen(tc, PXL_PLLCTRL); } static int tc_pxl_pll_dis(struct tc_data *tc) @@ -615,7 +617,6 @@ static int tc_set_syspllparam(struct tc_data *tc) static int tc_aux_link_setup(struct tc_data *tc) { int ret; - u32 dp_phy_ctrl; u32 dp0_auxcfg1; /* Setup DP-PHY / PLL */ @@ -630,15 +631,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 */ - ret = regmap_write(tc->regmap, DP0_PLLCTRL, PLLUPDATE | PLLEN); + ret = tc_pllupdate_pllen(tc, DP0_PLLCTRL); if (ret) goto err; - tc_wait_pll_lock(tc); - ret = regmap_write(tc->regmap, DP1_PLLCTRL, PLLUPDATE | PLLEN); + ret = tc_pllupdate_pllen(tc, DP1_PLLCTRL); if (ret) goto err; - tc_wait_pll_lock(tc); ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1, 1000); if (ret == -ETIMEDOUT) { @@ -823,6 +822,7 @@ static int tc_main_link_enable(struct tc_data *tc) { struct drm_dp_aux *aux = &tc->aux; struct device *dev = tc->dev; + u32 dp_phy_ctrl; u32 value; int ret; u8 tmp[8]; @@ -858,15 +858,13 @@ static int tc_main_link_enable(struct tc_data *tc) return ret; /* PLL setup */ - ret = regmap_write(tc->regmap, DP0_PLLCTRL, PLLUPDATE | PLLEN); + ret = tc_pllupdate_pllen(tc, DP0_PLLCTRL); if (ret) return ret; - tc_wait_pll_lock(tc); - ret = regmap_write(tc->regmap, DP1_PLLCTRL, PLLUPDATE | PLLEN); + ret = tc_pllupdate_pllen(tc, DP1_PLLCTRL); if (ret) return ret; - tc_wait_pll_lock(tc); /* Reset/Enable Main Links */ dp_phy_ctrl |= DP_PHY_RST | PHY_M1_RST | PHY_M0_RST;