mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
clk: rockchip: convert basic pll lock_wait to use regmap_read_poll_timeout
Instead of open coding the polling of the lock status, use the handy regmap_read_poll_timeout for this. As the pll locking is normally blazingly fast and we don't want to incur additional delays, we're not doing any sleeps similar to for example the imx clk-pllv4 and define a very safe but still short timeout of 1ms. Suggested-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Link: https://lore.kernel.org/r/20200129163821.1547295-2-heiko@sntech.de
This commit is contained in:
parent
bf4237a188
commit
3507df1a46
1 changed files with 6 additions and 15 deletions
|
@ -86,23 +86,14 @@ static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll)
|
|||
{
|
||||
struct regmap *grf = pll->ctx->grf;
|
||||
unsigned int val;
|
||||
int delay = 24000000, ret;
|
||||
int ret;
|
||||
|
||||
while (delay > 0) {
|
||||
ret = regmap_read(grf, pll->lock_offset, &val);
|
||||
if (ret) {
|
||||
pr_err("%s: failed to read pll lock status: %d\n",
|
||||
__func__, ret);
|
||||
return ret;
|
||||
}
|
||||
ret = regmap_read_poll_timeout(grf, pll->lock_offset, val,
|
||||
val & BIT(pll->lock_shift), 0, 1000);
|
||||
if (ret)
|
||||
pr_err("%s: timeout waiting for pll to lock\n", __func__);
|
||||
|
||||
if (val & BIT(pll->lock_shift))
|
||||
return 0;
|
||||
delay--;
|
||||
}
|
||||
|
||||
pr_err("%s: timeout waiting for pll to lock\n", __func__);
|
||||
return -ETIMEDOUT;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue