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

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

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



Switch the imx_clk_hw_pllv3 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 1f9aec96

drivers/clk/imx/clk-pllv3.c

+9 −5
Original line number Diff line number Diff line
@@ -416,14 +416,15 @@ static const struct clk_ops clk_pllv3_enet_ops = { 
	.recalc_rate	= clk_pllv3_enet_recalc_rate,

};



struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,

struct clk_hw *imx_clk_hw_pllv3(enum imx_pllv3_type type, const char *name,

			  const char *parent_name, void __iomem *base,

			  u32 div_mask)

{

	struct clk_pllv3 *pll;

	const struct clk_ops *ops;

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init;

	int ret;



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

	if (!pll)
@@ -484,10 +485,13 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, 
	init.num_parents = 1;



	pll->hw.init = &init;

	hw = &pll->hw;



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

	if (IS_ERR(clk))

	ret = clk_hw_register(NULL, hw);

	if (ret) {

		kfree(pll);

		return ERR_PTR(ret);

	}



	return clk;

	return hw;

}

drivers/clk/imx/clk.h

+4 −1
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ struct imx_pll14xx_clk { 
	clk_hw_register_gate2(dev, name, parent_name, flags, reg, bit_idx, \

				cgr_val, clk_gate_flags, lock, share_count)->clk



#define imx_clk_pllv3(type, name, parent_name, base, div_mask) \

	imx_clk_hw_pllv3(type, name, parent_name, base, div_mask)->clk



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

		 void __iomem *base, const struct imx_pll14xx_clk *pll_clk);
@@ -96,7 +99,7 @@ enum imx_pllv3_type { 
	IMX_PLLV3_AV_IMX7,

};



struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,

struct clk_hw *imx_clk_hw_pllv3(enum imx_pllv3_type type, const char *name,

		const char *parent_name, void __iomem *base, u32 div_mask);



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