summaryrefslogtreecommitdiffstats
path: root/drivers/clk/qcom/clk-pll.c
diff options
context:
space:
mode:
authorStephen Boyd2015-07-31 02:20:57 +0200
committerMichael Turquette2015-08-25 01:48:52 +0200
commitac269395cdd80b9b088d9b5306015bd4b8bc176d (patch)
treefa0f1d574437ee6d8cf8ddfaa7b7697fbd346916 /drivers/clk/qcom/clk-pll.c
parentclk: stm32f4: Convert to clk_hw based provider APIs (diff)
downloadkernel-qcow2-linux-ac269395cdd80b9b088d9b5306015bd4b8bc176d.tar.gz
kernel-qcow2-linux-ac269395cdd80b9b088d9b5306015bd4b8bc176d.tar.xz
kernel-qcow2-linux-ac269395cdd80b9b088d9b5306015bd4b8bc176d.zip
clk: qcom: Convert to clk_hw based provider APIs
We're removing struct clk from the clk provider API, so switch this code to using the clk_hw based provider APIs. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/qcom/clk-pll.c')
-rw-r--r--drivers/clk/qcom/clk-pll.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/clk/qcom/clk-pll.c b/drivers/clk/qcom/clk-pll.c
index a34656bec648..5b940d629045 100644
--- a/drivers/clk/qcom/clk-pll.c
+++ b/drivers/clk/qcom/clk-pll.c
@@ -138,13 +138,9 @@ struct pll_freq_tbl *find_freq(const struct pll_freq_tbl *f, unsigned long rate)
static int
clk_pll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req)
{
- struct clk *parent = __clk_get_parent(hw->clk);
struct clk_pll *pll = to_clk_pll(hw);
const struct pll_freq_tbl *f;
- req->best_parent_hw = __clk_get_hw(parent);
- req->best_parent_rate = __clk_get_rate(parent);
-
f = find_freq(pll->freq_tbl, req->rate);
if (!f)
req->rate = clk_pll_recalc_rate(hw, req->best_parent_rate);
@@ -198,7 +194,7 @@ static int wait_for_pll(struct clk_pll *pll)
u32 val;
int count;
int ret;
- const char *name = __clk_get_name(pll->clkr.hw.clk);
+ const char *name = clk_hw_get_name(&pll->clkr.hw);
/* Wait for pll to enable. */
for (count = 200; count > 0; count--) {
@@ -217,7 +213,7 @@ static int wait_for_pll(struct clk_pll *pll)
static int clk_pll_vote_enable(struct clk_hw *hw)
{
int ret;
- struct clk_pll *p = to_clk_pll(__clk_get_hw(__clk_get_parent(hw->clk)));
+ struct clk_pll *p = to_clk_pll(clk_hw_get_parent(hw));
ret = clk_enable_regmap(hw);
if (ret)