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

Commit 2597b39e authored by Abel Vesa's avatar Abel Vesa Committed by Shawn Guo
Browse files

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



Switch the imx_clk_fixup_divider 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: 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 dfc148b3

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

+10 −5
Original line number Diff line number Diff line
@@ -91,13 +91,14 @@ static const struct clk_ops clk_fixup_div_ops = { 
	.set_rate = clk_fixup_div_set_rate,

};



struct clk *imx_clk_fixup_divider(const char *name, const char *parent,

struct clk_hw *imx_clk_hw_fixup_divider(const char *name, const char *parent,

				  void __iomem *reg, u8 shift, u8 width,

				  void (*fixup)(u32 *val))

{

	struct clk_fixup_div *fixup_div;

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init;

	int ret;



	if (!fixup)

		return ERR_PTR(-EINVAL);
@@ -120,9 +121,13 @@ struct clk *imx_clk_fixup_divider(const char *name, const char *parent, 
	fixup_div->ops = &clk_divider_ops;

	fixup_div->fixup = fixup;



	clk = clk_register(NULL, &fixup_div->divider.hw);

	if (IS_ERR(clk))

	hw = &fixup_div->divider.hw;



	ret = clk_hw_register(NULL, hw);

	if (ret) {

		kfree(fixup_div);

		return ERR_PTR(ret);

	}



	return clk;

	return hw;

}

drivers/clk/imx/clk.h

+5 −2
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ struct imx_pll14xx_clk { 
#define imx_clk_gate_exclusive(name, parent, reg, shift, exclusive_mask) \

	imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask)->clk



#define imx_clk_fixup_divider(name, parent, reg, shift, width, fixup) \

	imx_clk_hw_fixup_divider(name, parent, reg, shift, width, fixup)->clk



struct clk *imx_clk_pll14xx(const char *name, const char *parent_name,

		 void __iomem *base, const struct imx_pll14xx_clk *pll_clk);
@@ -149,11 +152,11 @@ struct clk_hw *imx7ulp_clk_composite(const char *name, 
				     bool rate_present, bool gate_present,

				     void __iomem *reg);



struct clk *imx_clk_fixup_divider(const char *name, const char *parent,

struct clk_hw *imx_clk_hw_fixup_divider(const char *name, const char *parent,

				  void __iomem *reg, u8 shift, u8 width,

				  void (*fixup)(u32 *val));



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));