Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ead0f1e authored by Abel Vesa's avatar Abel Vesa Committed by Shawn Guo
Browse files

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



Switch the imx_clk_fixup_mux function to clk_hw based API, rename
accordingly and add a macro for clk based legacy. 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: default avatarAbel Vesa <abel.vesa@nxp.com>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 2597b39e

drivers/clk/imx/clk-fixup-mux.c

+10 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/clk/imx/clk.h

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,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);