* [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
@ 2020-03-19 23:44 ` Anson Huang
0 siblings, 0 replies; 6+ messages in thread
From: Anson Huang @ 2020-03-19 23:44 UTC (permalink / raw)
To: mturquette, sboyd, shawnguo, s.hauer, kernel, festevam, gustavo,
gregkh, tglx, abel.vesa, linux-clk, linux-arm-kernel,
linux-kernel
Cc: Linux-imx
Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
code a lot.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
---
Changes since V1:
- Use readl_relaxed_poll_timeout() instead of readl_poll_timeout().
---
drivers/clk/imx/clk-pllv3.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index df91a82..a7db930 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -7,6 +7,7 @@
#include <linux/clk-provider.h>
#include <linux/delay.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/err.h>
@@ -25,6 +26,8 @@
#define IMX7_ENET_PLL_POWER (0x1 << 5)
#define IMX7_DDR_PLL_POWER (0x1 << 20)
+#define PLL_LOCK_TIMEOUT 10000
+
/**
* struct clk_pllv3 - IMX PLL clock version 3
* @clk_hw: clock source
@@ -53,23 +56,14 @@ struct clk_pllv3 {
static int clk_pllv3_wait_lock(struct clk_pllv3 *pll)
{
- unsigned long timeout = jiffies + msecs_to_jiffies(10);
u32 val = readl_relaxed(pll->base) & pll->power_bit;
/* No need to wait for lock when pll is not powered up */
if ((pll->powerup_set && !val) || (!pll->powerup_set && val))
return 0;
- /* Wait for PLL to lock */
- do {
- if (readl_relaxed(pll->base) & BM_PLL_LOCK)
- break;
- if (time_after(jiffies, timeout))
- break;
- usleep_range(50, 500);
- } while (1);
-
- return readl_relaxed(pll->base) & BM_PLL_LOCK ? 0 : -ETIMEDOUT;
+ return readl_relaxed_poll_timeout(pll->base, val, val & BM_PLL_LOCK,
+ 500, PLL_LOCK_TIMEOUT);
}
static int clk_pllv3_prepare(struct clk_hw *hw)
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
@ 2020-03-19 23:44 ` Anson Huang
0 siblings, 0 replies; 6+ messages in thread
From: Anson Huang @ 2020-03-19 23:44 UTC (permalink / raw)
To: mturquette, sboyd, shawnguo, s.hauer, kernel, festevam, gustavo,
gregkh, tglx, abel.vesa, linux-clk, linux-arm-kernel,
linux-kernel
Cc: Linux-imx
Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
code a lot.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
---
Changes since V1:
- Use readl_relaxed_poll_timeout() instead of readl_poll_timeout().
---
drivers/clk/imx/clk-pllv3.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index df91a82..a7db930 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -7,6 +7,7 @@
#include <linux/clk-provider.h>
#include <linux/delay.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/err.h>
@@ -25,6 +26,8 @@
#define IMX7_ENET_PLL_POWER (0x1 << 5)
#define IMX7_DDR_PLL_POWER (0x1 << 20)
+#define PLL_LOCK_TIMEOUT 10000
+
/**
* struct clk_pllv3 - IMX PLL clock version 3
* @clk_hw: clock source
@@ -53,23 +56,14 @@ struct clk_pllv3 {
static int clk_pllv3_wait_lock(struct clk_pllv3 *pll)
{
- unsigned long timeout = jiffies + msecs_to_jiffies(10);
u32 val = readl_relaxed(pll->base) & pll->power_bit;
/* No need to wait for lock when pll is not powered up */
if ((pll->powerup_set && !val) || (!pll->powerup_set && val))
return 0;
- /* Wait for PLL to lock */
- do {
- if (readl_relaxed(pll->base) & BM_PLL_LOCK)
- break;
- if (time_after(jiffies, timeout))
- break;
- usleep_range(50, 500);
- } while (1);
-
- return readl_relaxed(pll->base) & BM_PLL_LOCK ? 0 : -ETIMEDOUT;
+ return readl_relaxed_poll_timeout(pll->base, val, val & BM_PLL_LOCK,
+ 500, PLL_LOCK_TIMEOUT);
}
static int clk_pllv3_prepare(struct clk_hw *hw)
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
2020-03-19 23:44 ` Anson Huang
@ 2020-03-21 0:44 ` Stephen Boyd
-1 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2020-03-21 0:44 UTC (permalink / raw)
To: Anson Huang, abel.vesa, festevam, gregkh, gustavo, kernel,
linux-arm-kernel, linux-clk, linux-kernel, mturquette, s.hauer,
shawnguo, tglx
Cc: Linux-imx
Quoting Anson Huang (2020-03-19 16:44:03)
> Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
> code a lot.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
> ---
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
@ 2020-03-21 0:44 ` Stephen Boyd
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2020-03-21 0:44 UTC (permalink / raw)
To: Anson Huang, abel.vesa, festevam, gregkh, gustavo, kernel,
linux-arm-kernel, linux-clk, linux-kernel, mturquette, s.hauer,
shawnguo, tglx
Cc: Linux-imx
Quoting Anson Huang (2020-03-19 16:44:03)
> Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
> code a lot.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
> ---
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
2020-03-19 23:44 ` Anson Huang
@ 2020-04-20 14:56 ` Shawn Guo
-1 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2020-04-20 14:56 UTC (permalink / raw)
To: Anson Huang
Cc: mturquette, sboyd, s.hauer, kernel, festevam, gustavo, gregkh,
tglx, abel.vesa, linux-clk, linux-arm-kernel, linux-kernel,
Linux-imx
On Fri, Mar 20, 2020 at 07:44:03AM +0800, Anson Huang wrote:
> Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
> code a lot.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait
@ 2020-04-20 14:56 ` Shawn Guo
0 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2020-04-20 14:56 UTC (permalink / raw)
To: Anson Huang
Cc: abel.vesa, gustavo, sboyd, gregkh, mturquette, linux-kernel,
linux-clk, Linux-imx, kernel, tglx, festevam, s.hauer,
linux-arm-kernel
On Fri, Mar 20, 2020 at 07:44:03AM +0800, Anson Huang wrote:
> Use readl_relaxed_poll_timeout() for PLL lock wait which can simplify the
> code a lot.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
Applied, thanks.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-20 14:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-19 23:44 [PATCH V2] clk: imx: clk-pllv3: Use readl_relaxed_poll_timeout() for PLL lock wait Anson Huang
2020-03-19 23:44 ` Anson Huang
2020-03-21 0:44 ` Stephen Boyd
2020-03-21 0:44 ` Stephen Boyd
2020-04-20 14:56 ` Shawn Guo
2020-04-20 14:56 ` Shawn Guo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.