summaryrefslogtreecommitdiff
path: root/drivers/clk/ti/dpll3xxx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2016-02-20 14:12:57 +0300
committerStephen Boyd <sboyd@codeaurora.org>2016-02-23 01:03:02 +0300
commita0d54c3899aaeb047969d9479263c6bcf385c331 (patch)
treeaf6418016466901b116c45d376ae11f935f017fd /drivers/clk/ti/dpll3xxx.c
parent4462b4bbfc33a44f19710ead784ff361bda2c3b3 (diff)
downloadlinux-a0d54c3899aaeb047969d9479263c6bcf385c331.tar.xz
clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
As the code in this file is being executed within irq context in some cases, we must avoid the clk_get_rate which uses mutex internally. Switch the code to use clk_hw_get_rate instead which is non-locking. This fixes an issue where PM runtime will hang the system if enabled with a serial console before a suspend-resume cycle. Signed-off-by: Tero Kristo <t-kristo@ti.com> Tested-by: Tony Lindgren <tony@atomide.com> Fixes: a53ad8ef3dcc ("clk: ti: Convert to clk_hw based provider APIs") Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/ti/dpll3xxx.c')
-rw-r--r--drivers/clk/ti/dpll3xxx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c
index 1c300388782b..cc739291a3ce 100644
--- a/drivers/clk/ti/dpll3xxx.c
+++ b/drivers/clk/ti/dpll3xxx.c
@@ -460,7 +460,8 @@ int omap3_noncore_dpll_enable(struct clk_hw *hw)
parent = clk_hw_get_parent(hw);
- if (clk_hw_get_rate(hw) == clk_get_rate(dd->clk_bypass)) {
+ if (clk_hw_get_rate(hw) ==
+ clk_hw_get_rate(__clk_get_hw(dd->clk_bypass))) {
WARN_ON(parent != __clk_get_hw(dd->clk_bypass));
r = _omap3_noncore_dpll_bypass(clk);
} else {