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

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

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: 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 995087c9

drivers/clk/imx/clk-gate-exclusive.c

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

}

drivers/clk/imx/clk.h

+4 −1
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ struct imx_pll14xx_clk { 
#define imx_clk_pfd(name, parent_name, reg, idx) \

	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,

		 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,

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



struct clk_hw *imx_clk_hw_pfd(const char *name, const char *parent_name,