clk: imx: pllv1: Switch to clk_hw based API (556f7880) · Commits · 戴 / test

drivers/clk/imx/clk-pllv1.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -111,12 +111,13 @@ static const struct clk_ops clk_pllv1_ops = {
		.recalc_rate = clk_pllv1_recalc_rate,
		};

		struct clk imx_clk_pllv1(enum imx_pllv1_type type, const char name,
		struct clk_hw imx_clk_hw_pllv1(enum imx_pllv1_type type, const char name,
		const char parent, void __iomem base)
		{
		struct clk_pllv1 *pll;
		struct clk *clk;
		struct clk_hw *hw;
		struct clk_init_data init;
		int ret;

		pll = kmalloc(sizeof(*pll), GFP_KERNEL);
		if (!pll)
		@@ -132,10 +133,13 @@ struct clk imx_clk_pllv1(enum imx_pllv1_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;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -110,10 +110,13 @@ extern struct imx_pll14xx_clk imx_1443x_dram_pll;
		#define imx_clk_mux(name, reg, shift, width, parents, num_parents) \
		to_clk(imx_clk_hw_mux(name, reg, shift, width, parents, num_parents))

		#define imx_clk_pllv1(type, name, parent, base) \
		to_clk(imx_clk_hw_pllv1(type, name, parent, base))

		struct clk imx_clk_pll14xx(const char name, const char *parent_name,
		void __iomem base, const struct imx_pll14xx_clk pll_clk);

		struct clk imx_clk_pllv1(enum imx_pllv1_type type, const char name,
		struct clk_hw imx_clk_hw_pllv1(enum imx_pllv1_type type, const char name,
		const char parent, void __iomem base);

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