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

diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
index 28b04aad31ad78380a942309f23f0c14aa837ab8..945f8b2cacc1db25dcd9b3649c3d5208c97719a6 100644 (file)
--- a/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c
@@ -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;
-
-       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;
-               }
+       int ret;
 
-               if (val & BIT(pll->lock_shift))
-                       return 0;
-               delay--;
-       }
+       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__);
 
-       pr_err("%s: timeout waiting for pll to lock\n", __func__);
-       return -ETIMEDOUT;
+       return ret;
 }
 
 /**