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

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

clk: imx: clk-cpu: Switch to clk_hw based API 



Switch the clk_cpu clock registering function to clk_hw based API 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 dd1a6c0d

drivers/clk/imx/clk-cpu.c

+9 −5
Original line number Diff line number Diff line
@@ -75,13 +75,14 @@ static const struct clk_ops clk_cpu_ops = { 
	.set_rate	= clk_cpu_set_rate,

};



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

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

		struct clk *div, struct clk *mux, struct clk *pll,

		struct clk *step)

{

	struct clk_cpu *cpu;

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init;

	int ret;



	cpu = kzalloc(sizeof(*cpu), GFP_KERNEL);

	if (!cpu)
@@ -99,10 +100,13 @@ struct clk *imx_clk_cpu(const char *name, const char *parent_name, 
	init.num_parents = 1;



	cpu->hw.init = &init;

	hw = &cpu->hw;



	clk = clk_register(NULL, &cpu->hw);

	if (IS_ERR(clk))

	ret = clk_hw_register(NULL, hw);

	if (ret) {

		kfree(cpu);

		return ERR_PTR(ret);

	}



	return clk;

	return hw;

}

drivers/clk/imx/clk.h

+4 −1
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ struct imx_pll14xx_clk { 
#define imx_clk_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents) \

	imx_clk_hw_busy_mux(name, reg, shift, width, busy_reg, busy_shift, parent_names, num_parents)->clk



#define imx_clk_cpu(name, parent_name, div, mux, pll, step) \

	imx_clk_hw_cpu(name, parent_name, div, mux, pll, step)->clk



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

		 void __iomem *base, const struct imx_pll14xx_clk *pll_clk);
@@ -384,7 +387,7 @@ static inline struct clk_hw *imx_clk_hw_mux_flags(const char *name, 
				   reg, shift, width, 0, &imx_ccm_lock);

}



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

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

		struct clk *div, struct clk *mux, struct clk *pll,

		struct clk *step);