lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 12/19] clk: imx: clk-fixup-mux: Switch to clk_hw based API
    Date
    Switch the imx_clk_fixup_mux function to clk_hw based API,
    rename accordingly and add a macro for clk based legacy.

    Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
    ---
    drivers/clk/imx/clk-fixup-mux.c | 15 ++++++++++-----
    drivers/clk/imx/clk.h | 3 +++
    2 files changed, 13 insertions(+), 5 deletions(-)

    diff --git a/drivers/clk/imx/clk-fixup-mux.c b/drivers/clk/imx/clk-fixup-mux.c
    index 44817c1..f3c4ec2 100644
    --- a/drivers/clk/imx/clk-fixup-mux.c
    +++ b/drivers/clk/imx/clk-fixup-mux.c
    @@ -69,13 +69,14 @@ static const struct clk_ops clk_fixup_mux_ops = {
    .set_parent = clk_fixup_mux_set_parent,
    };

    -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,
    int num_parents, void (*fixup)(u32 *val))
    {
    struct clk_fixup_mux *fixup_mux;
    - struct clk *clk;
    + struct clk_hw *hw;
    struct clk_init_data init;
    + int ret;

    if (!fixup)
    return ERR_PTR(-EINVAL);
    @@ -98,9 +99,13 @@ struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg,
    fixup_mux->ops = &clk_mux_ops;
    fixup_mux->fixup = fixup;

    - clk = clk_register(NULL, &fixup_mux->mux.hw);
    - if (IS_ERR(clk))
    + hw = &fixup_mux->mux.hw;
    +
    + ret = clk_hw_register(NULL, hw);
    + if (ret) {
    kfree(fixup_mux);
    + return ERR_PTR(ret);
    + }

    - return clk;
    + return hw;
    }
    diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
    index 3b1f687..a8da9dc 100644
    --- a/drivers/clk/imx/clk.h
    +++ b/drivers/clk/imx/clk.h
    @@ -75,6 +75,9 @@ struct imx_pll14xx_clk {
    #define imx_clk_fixup_divider(name, parent, reg, shift, width, fixup) \
    imx_clk_hw_fixup_divider(name, parent, reg, shift, width, fixup)->clk

    +#define imx_clk_fixup_mux(name, reg, shift, width, parents, num_parents, fixup) \
    + imx_clk_hw_fixup_mux(name, reg, shift, width, parents, num_parents, fixup)->clk
    +
    struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,
    void __iomem *base, const struct imx_pll14xx_clk *pll_clk);

    --
    2.7.4
    \
     
     \ /
      Last update: 2019-03-22 16:39    [W:3.288 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site