xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: imx: clk-gate-exclusive: Switch to clk_hw based API

Browse Source 
Switch the imx_clk_gate_exclusive 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:43 +00:00
committed by Shawn Guo
parent 995087c91e
commit dfc148b32a
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/clk/imx/clk-gate-exclusive.c
View File

@@ -58,13 +58,14 @@ static const struct clk_ops clk_gate_exclusive_ops = {
.is_enabled = clk_gate_exclusive_is_enabled, .is_enabled = clk_gate_exclusive_is_enabled,
}; };
struct clk *imx_clk_gate_exclusive(const char *name, const char *parent, struct clk_hw *imx_clk_hw_gate_exclusive(const char *name, const char *parent,
void __iomem *reg, u8 shift, u32 exclusive_mask) void __iomem *reg, u8 shift, u32 exclusive_mask)
{ {
struct clk_gate_exclusive *exgate; struct clk_gate_exclusive *exgate;
struct clk_gate *gate; struct clk_gate *gate;
struct clk *clk; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init;
int ret;
if (exclusive_mask == 0) if (exclusive_mask == 0)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
@@ -86,9 +87,13 @@ struct clk *imx_clk_gate_exclusive(const char *name, const char *parent,
gate->hw.init = &init; gate->hw.init = &init;
exgate->exclusive_mask = exclusive_mask; exgate->exclusive_mask = exclusive_mask;
clk = clk_register(NULL, &gate->hw); hw = &gate->hw;
if (IS_ERR(clk))
kfree(exgate);
return clk; ret = clk_hw_register(NULL, hw);
if (ret) {
kfree(gate);
return ERR_PTR(ret);
}
return hw;
} }

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

@@ -70,6 +70,9 @@ struct imx_pll14xx_clk {
#define imx_clk_pfd(name, parent_name, reg, idx) \ #define imx_clk_pfd(name, parent_name, reg, idx) \
imx_clk_hw_pfd(name, parent_name, reg, idx)->clk imx_clk_hw_pfd(name, parent_name, reg, idx)->clk
#define imx_clk_gate_exclusive(name, parent, reg, shift, exclusive_mask) \
imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask)->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);
@@ -123,7 +126,7 @@ struct clk_hw *imx_obtain_fixed_clock_hw(
struct clk_hw *imx_obtain_fixed_clk_hw(struct device_node *np, struct clk_hw *imx_obtain_fixed_clk_hw(struct device_node *np,
const char *name); const char *name);
struct clk *imx_clk_gate_exclusive(const char *name, const char *parent, struct clk_hw *imx_clk_hw_gate_exclusive(const char *name, const char *parent,
void __iomem *reg, u8 shift, u32 exclusive_mask); void __iomem *reg, u8 shift, u32 exclusive_mask);
struct clk_hw *imx_clk_hw_pfd(const char *name, const char *parent_name, struct clk_hw *imx_clk_hw_pfd(const char *name, const char *parent_name,