UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: imx: clk-fixup-div: Switch to clk_hw based API 

Switch the imx_clk_fixup_divider 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: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Abel Vesa 2019-05-29 12:26:44 +00:00 committed by Shawn Guo
parent dfc148b32a
commit 2597b39ed1
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/clk/imx/clk-fixup-div.c
View File

@ -91,13 +91,14 @@ static const struct clk_ops clk_fixup_div_ops = {
.set_rate = clk_fixup_div_set_rate, .set_rate = clk_fixup_div_set_rate,
}; };
struct clk *imx_clk_fixup_divider(const char *name, const char *parent, struct clk_hw *imx_clk_hw_fixup_divider(const char *name, const char *parent,
void __iomem *reg, u8 shift, u8 width, void __iomem *reg, u8 shift, u8 width,
void (*fixup)(u32 *val)) void (*fixup)(u32 *val))
{ {
struct clk_fixup_div *fixup_div; struct clk_fixup_div *fixup_div;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
if (!fixup) if (!fixup)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
@ -120,9 +121,13 @@ struct clk *imx_clk_fixup_divider(const char *name, const char *parent,
fixup_div->ops = &clk_divider_ops; fixup_div->ops = &clk_divider_ops;
fixup_div->fixup = fixup; fixup_div->fixup = fixup;
clk = clk_register(NULL, &fixup_div->divider.hw); hw = &fixup_div->divider.hw;
if (IS_ERR(clk))
kfree(fixup_div);
return clk; ret = clk_hw_register(NULL, hw);
if (ret) {
kfree(fixup_div);
return ERR_PTR(ret);
}
return hw;
} }

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

@ -73,6 +73,9 @@ struct imx_pll14xx_clk {
#define imx_clk_gate_exclusive(name, parent, reg, shift, exclusive_mask) \ #define imx_clk_gate_exclusive(name, parent, reg, shift, exclusive_mask) \
imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask)->clk imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask)->clk
#define imx_clk_fixup_divider(name, parent, reg, shift, width, fixup) \
imx_clk_hw_fixup_divider(name, parent, reg, shift, width, fixup)->clk
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);
@ -149,11 +152,11 @@ struct clk_hw *imx7ulp_clk_composite(const char *name,
bool rate_present, bool gate_present, bool rate_present, bool gate_present,
void __iomem *reg); void __iomem *reg);
struct clk *imx_clk_fixup_divider(const char *name, const char *parent, struct clk_hw *imx_clk_hw_fixup_divider(const char *name, const char *parent,
void __iomem *reg, u8 shift, u8 width, void __iomem *reg, u8 shift, u8 width,
void (*fixup)(u32 *val)); void (*fixup)(u32 *val));
struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, struct clk_hw *imx_clk_hw_fixup_mux(const char *name, void __iomem *reg,
u8 shift, u8 width, const char * const *parents, u8 shift, u8 width, const char * const *parents,
int num_parents, void (*fixup)(u32 *val)); int num_parents, void (*fixup)(u32 *val));