From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Archit Taneja <architt@codeaurora.org>,
Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Chris Healy <cphealy@gmail.com>,
Lucas Stach <l.stach@pengutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 8/9] drm/bridge: tc358767: Introduce tc_pllupdate_pllen()
Date: Tue, 26 Feb 2019 11:36:08 -0800 [thread overview]
Message-ID: <20190226193609.9862-9-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190226193609.9862-1-andrew.smirnov@gmail.com>
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 <andrew.smirnov@gmail.com>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
---
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) {
--
2.20.1
next prev parent reply other threads:[~2019-02-26 19:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 19:36 [PATCH 0/9] tc358767 driver improvements Andrey Smirnov
2019-02-26 19:36 ` [PATCH 1/9] drm/bridge: tc358767: Simplify tc_poll_timeout() Andrey Smirnov
2019-03-04 9:28 ` Andrzej Hajda
2019-03-04 12:17 ` Laurent Pinchart
2019-02-26 19:36 ` [PATCH 2/9] drm/bridge: tc358767: Simplify tc_stream_clock_calc() Andrey Smirnov
2019-03-04 9:42 ` Andrzej Hajda
2019-03-04 12:20 ` Laurent Pinchart
2019-03-11 17:51 ` Andrey Smirnov
2019-02-26 19:36 ` [PATCH 3/9] drm/bridge: tc358767: Simplify tc_set_video_mode() Andrey Smirnov
2019-03-04 12:25 ` Laurent Pinchart
2019-03-11 17:56 ` Andrey Smirnov
2019-02-26 19:36 ` [PATCH 4/9] drm/bridge: tc358767: Simplify polling in tc_main_link_setup() Andrey Smirnov
2019-03-04 12:28 ` Laurent Pinchart
2019-02-26 19:36 ` [PATCH 5/9] drm/bridge: tc358767: Simplify polling in tc_link_training() Andrey Smirnov
2019-03-04 12:30 ` Laurent Pinchart
2019-03-11 18:26 ` Andrey Smirnov
2019-03-12 15:15 ` Laurent Pinchart
2019-02-26 19:36 ` [PATCH 6/9] drm/bridge: tc358767: Simplify error check in tc_aux_linx_setup() Andrey Smirnov
2019-03-04 12:33 ` Laurent Pinchart
2019-03-11 18:32 ` Andrey Smirnov
2019-02-26 19:36 ` [PATCH 7/9] drm/bridge: tc358767: Introduce tc_set_syspllparam() Andrey Smirnov
2019-03-04 12:34 ` Laurent Pinchart
2019-02-26 19:36 ` Andrey Smirnov [this message]
2019-03-04 12:37 ` [PATCH 8/9] drm/bridge: tc358767: Introduce tc_pllupdate_pllen() Laurent Pinchart
2019-02-26 19:36 ` [PATCH 9/9] drm/bridge: tc358767: Drop tc_read() macro Andrey Smirnov
2019-03-04 12:39 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190226193609.9862-9-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=architt@codeaurora.org \
--cc=cphealy@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).