clk: at91: Migrate to clk_hw based registration and OF APIs

[cascardo/linux.git] / drivers / clk / at91 / clk-pll.c

diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c
index fb2e0b5..45ad168 100644 (file)
--- a/drivers/clk/at91/clk-pll.c
+++ b/drivers/clk/at91/clk-pll.c
@@ -296,17 +296,18 @@ static const struct clk_ops pll_ops = {
        .set_rate = clk_pll_set_rate,
 };
 
-static struct clk * __init
+static struct clk_hw * __init
 at91_clk_register_pll(struct regmap *regmap, const char *name,
                      const char *parent_name, u8 id,
                      const struct clk_pll_layout *layout,
                      const struct clk_pll_characteristics *characteristics)
 {
        struct clk_pll *pll;
-       struct clk *clk = NULL;
+       struct clk_hw *hw;
        struct clk_init_data init;
        int offset = PLL_REG(id);
        unsigned int pllr;
+       int ret;
 
        if (id > PLL_MAX_ID)
                return ERR_PTR(-EINVAL);
@@ -330,12 +331,14 @@ at91_clk_register_pll(struct regmap *regmap, const char *name,
        pll->div = PLL_DIV(pllr);
        pll->mul = PLL_MUL(pllr, layout);
 
-       clk = clk_register(NULL, &pll->hw);
-       if (IS_ERR(clk)) {
+       hw = &pll->hw;
+       ret = clk_hw_register(NULL, &pll->hw);
+       if (ret) {
                kfree(pll);
+               hw = ERR_PTR(ret);
        }
 
-       return clk;
+       return hw;
 }
 
 
@@ -465,7 +468,7 @@ of_at91_clk_pll_setup(struct device_node *np,
                      const struct clk_pll_layout *layout)
 {
        u32 id;
-       struct clk *clk;
+       struct clk_hw *hw;
        struct regmap *regmap;
        const char *parent_name;
        const char *name = np->name;
@@ -486,12 +489,12 @@ of_at91_clk_pll_setup(struct device_node *np,
        if (!characteristics)
                return;
 
-       clk = at91_clk_register_pll(regmap, name, parent_name, id, layout,
+       hw = at91_clk_register_pll(regmap, name, parent_name, id, layout,
                                    characteristics);
-       if (IS_ERR(clk))
+       if (IS_ERR(hw))
                goto out_free_characteristics;
 
-       of_clk_add_provider(np, of_clk_src_simple_get, clk);
+       of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
        return;
 
 out_free_characteristics: