diff options
author | Abel Vesa <abel.vesa@nxp.com> | 2019-05-29 12:26:43 +0000 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2019-06-07 08:36:30 +0800 |
commit | dfc148b32a795293e032dcc1bbe52829f07c2fe4 (patch) | |
tree | 4ea04a456475cf6ed29babee0040fbe156c6f01a /drivers/clk/imx/clk-gate-exclusive.c | |
parent | 995087c91e9c2d0e7f312e6f5cc320b9847265c9 (diff) |
clk: imx: clk-gate-exclusive: Switch to clk_hw based API
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>
Diffstat (limited to 'drivers/clk/imx/clk-gate-exclusive.c')
-rw-r--r-- | drivers/clk/imx/clk-gate-exclusive.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/clk/imx/clk-gate-exclusive.c b/drivers/clk/imx/clk-gate-exclusive.c index 3bd9dee618b2..7bd9f1409701 100644 --- a/drivers/clk/imx/clk-gate-exclusive.c +++ b/drivers/clk/imx/clk-gate-exclusive.c @@ -58,13 +58,14 @@ static const struct clk_ops clk_gate_exclusive_ops = { .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) { struct clk_gate_exclusive *exgate; struct clk_gate *gate; - struct clk *clk; + struct clk_hw *hw; struct clk_init_data init; + int ret; if (exclusive_mask == 0) return ERR_PTR(-EINVAL); @@ -86,9 +87,13 @@ struct clk *imx_clk_gate_exclusive(const char *name, const char *parent, gate->hw.init = &init; exgate->exclusive_mask = exclusive_mask; - clk = clk_register(NULL, &gate->hw); - if (IS_ERR(clk)) - kfree(exgate); + hw = &gate->hw; - return clk; + ret = clk_hw_register(NULL, hw); + if (ret) { + kfree(gate); + return ERR_PTR(ret); + } + + return hw; } |