summaryrefslogtreecommitdiff
path: root/drivers/clk/ti
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-02-23 01:16:24 +0300
committerStephen Boyd <sboyd@codeaurora.org>2016-02-23 01:16:24 +0300
commit1e59403990acfb67d0e9ddf57fe6acc1c2aff4dc (patch)
treeefb24b7d33ec196eb4f8670add34fe7de7de7a5c /drivers/clk/ti
parent732d6913691848db9fabaa6a25b4d6fad10ddccf (diff)
parenta0d54c3899aaeb047969d9479263c6bcf385c331 (diff)
downloadlinux-1e59403990acfb67d0e9ddf57fe6acc1c2aff4dc.tar.xz
Merge branch 'clk-fixes' into clk-next
* clk-fixes: clk: ti: omap3+: dpll: use non-locking version of clk_get_rate
Diffstat (limited to 'drivers/clk/ti')
-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 {