iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: imx: pllv1: Switch to clk_hw based API

Browse Source 
Switch the imx_clk_pllv1 register function to clk_hw based API, rename
accordingly and add a macro for clk based legacy. This allows us to
move closer to a clear split between consumer and provider clk APIs.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Abel Vesa 2019-12-11 11:25:43 +02:00 committed by Shawn Guo
parent 0394d404c3
commit 556f788010
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/clk/imx/clk-pllv1.c
View File

@ -111,12 +111,13 @@ static const struct clk_ops clk_pllv1_ops = {
.recalc_rate = clk_pllv1_recalc_rate, .recalc_rate = clk_pllv1_recalc_rate,
}; };
struct clk *imx_clk_pllv1(enum imx_pllv1_type type, const char *name, struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name,
const char *parent, void __iomem *base) const char *parent, void __iomem *base)
{ {
struct clk_pllv1 *pll; struct clk_pllv1 *pll;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
pll = kmalloc(sizeof(*pll), GFP_KERNEL); pll = kmalloc(sizeof(*pll), GFP_KERNEL);
if (!pll) if (!pll)
@ -132,10 +133,13 @@ struct clk *imx_clk_pllv1(enum imx_pllv1_type type, const char *name,
init.num_parents = 1; init.num_parents = 1;
pll->hw.init = &init; pll->hw.init = &init;
hw = &pll->hw;
clk = clk_register(NULL, &pll->hw); ret = clk_hw_register(NULL, hw);
if (IS_ERR(clk)) if (ret) {
kfree(pll); kfree(pll);
return ERR_PTR(ret);
}
return clk; return hw;
} }

5
drivers/clk/imx/clk.h
View File

@ -110,10 +110,13 @@ extern struct imx_pll14xx_clk imx_1443x_dram_pll;
#define imx_clk_mux(name, reg, shift, width, parents, num_parents) \ #define imx_clk_mux(name, reg, shift, width, parents, num_parents) \
to_clk(imx_clk_hw_mux(name, reg, shift, width, parents, num_parents)) to_clk(imx_clk_hw_mux(name, reg, shift, width, parents, num_parents))
#define imx_clk_pllv1(type, name, parent, base) \
to_clk(imx_clk_hw_pllv1(type, name, parent, base))
struct clk *imx_clk_pll14xx(const char *name, const char *parent_name, struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,
void __iomem *base, const struct imx_pll14xx_clk *pll_clk); void __iomem *base, const struct imx_pll14xx_clk *pll_clk);
struct clk *imx_clk_pllv1(enum imx_pllv1_type type, const char *name, struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name,
const char *parent, void __iomem *base); const char *parent, void __iomem *base);
struct clk *imx_clk_pllv2(const char *name, const char *parent, struct clk *imx_clk_pllv2(const char *name, const char *parent,