p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clk: imx: clk-busy: Switch to clk_hw based API 

Switch all the clk_busy clock registering functions to clk_hw based API.
Keep around some clk based wrappers to be used by older imx platforms.
This allows us to move closer to a clear split of 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:42 +00:00 committed by Shawn Guo
parent f5697226f9
commit dd1a6c0d33
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/clk/imx/clk-busy.c
View File

@ -78,13 +78,14 @@ static const struct clk_ops clk_busy_divider_ops = {
.set_rate = clk_busy_divider_set_rate, .set_rate = clk_busy_divider_set_rate,
}; };
struct clk *imx_clk_busy_divider(const char *name, const char *parent_name, struct clk_hw *imx_clk_hw_busy_divider(const char *name, const char *parent_name,
void __iomem *reg, u8 shift, u8 width, void __iomem *reg, u8 shift, u8 width,
void __iomem *busy_reg, u8 busy_shift) void __iomem *busy_reg, u8 busy_shift)
{ {
struct clk_busy_divider *busy; struct clk_busy_divider *busy;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
busy = kzalloc(sizeof(*busy), GFP_KERNEL); busy = kzalloc(sizeof(*busy), GFP_KERNEL);
if (!busy) if (!busy)
@ -107,11 +108,15 @@ struct clk *imx_clk_busy_divider(const char *name, const char *parent_name,
busy->div.hw.init = &init; busy->div.hw.init = &init;
clk = clk_register(NULL, &busy->div.hw); hw = &busy->div.hw;
if (IS_ERR(clk))
kfree(busy);
return clk; ret = clk_hw_register(NULL, hw);
if (ret) {
kfree(busy);
return ERR_PTR(ret);
}
return hw;
} }
struct clk_busy_mux { struct clk_busy_mux {
@ -152,13 +157,14 @@ static const struct clk_ops clk_busy_mux_ops = {
.set_parent = clk_busy_mux_set_parent, .set_parent = clk_busy_mux_set_parent,
}; };
struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, struct clk_hw *imx_clk_hw_busy_mux(const char *name, void __iomem *reg, u8 shift,
u8 width, void __iomem *busy_reg, u8 busy_shift, u8 width, void __iomem *busy_reg, u8 busy_shift,
const char * const *parent_names, int num_parents) const char * const *parent_names, int num_parents)
{ {
struct clk_busy_mux *busy; struct clk_busy_mux *busy;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
busy = kzalloc(sizeof(*busy), GFP_KERNEL); busy = kzalloc(sizeof(*busy), GFP_KERNEL);
if (!busy) if (!busy)
@ -181,9 +187,13 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
busy->mux.hw.init = &init; busy->mux.hw.init = &init;
clk = clk_register(NULL, &busy->mux.hw); hw = &busy->mux.hw;
if (IS_ERR(clk))
kfree(busy);
return clk; ret = clk_hw_register(NULL, hw);
if (ret) {
kfree(busy);
return ERR_PTR(ret);
}
return hw;
} }

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

@ -10,6 +10,7 @@ extern spinlock_t imx_ccm_lock;
void imx_check_clocks(struct clk *clks[], unsigned int count); void imx_check_clocks(struct clk *clks[], unsigned int count);
void imx_check_clk_hws(struct clk_hw *clks[], unsigned int count); void imx_check_clk_hws(struct clk_hw *clks[], unsigned int count);
void imx_register_uart_clocks(struct clk ** const clks[]); void imx_register_uart_clocks(struct clk ** const clks[]);
void imx_register_uart_clocks_hws(struct clk_hw ** const hws[]);
void imx_mmdc_mask_handshake(void __iomem *ccm_base, unsigned int chn); void imx_mmdc_mask_handshake(void __iomem *ccm_base, unsigned int chn);
extern void imx_cscmr1_fixup(u32 *val); extern void imx_cscmr1_fixup(u32 *val);
@ -49,6 +50,12 @@ struct imx_pll14xx_clk {
int flags; int flags;
}; };
#define imx_clk_busy_divider(name, parent_name, reg, shift, width, busy_reg, busy_shift) \
imx_clk_hw_busy_divider(name, parent_name, reg, shift, width, busy_reg, busy_shift)->clk
#define imx_clk_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents) \
imx_clk_hw_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents)->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);
@ -111,11 +118,11 @@ struct clk *imx_clk_pfd(const char *name, const char *parent_name,
struct clk_hw *imx_clk_pfdv2(const char *name, const char *parent_name, struct clk_hw *imx_clk_pfdv2(const char *name, const char *parent_name,
void __iomem *reg, u8 idx); void __iomem *reg, u8 idx);
struct clk *imx_clk_busy_divider(const char *name, const char *parent_name, struct clk_hw *imx_clk_hw_busy_divider(const char *name, const char *parent_name,
void __iomem *reg, u8 shift, u8 width, void __iomem *reg, u8 shift, u8 width,
void __iomem *busy_reg, u8 busy_shift); void __iomem *busy_reg, u8 busy_shift);
struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, struct clk_hw *imx_clk_hw_busy_mux(const char *name, void __iomem *reg, u8 shift,
u8 width, void __iomem *busy_reg, u8 busy_shift, u8 width, void __iomem *busy_reg, u8 busy_shift,
const char * const *parent_names, int num_parents); const char * const *parent_names, int num_parents);