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

Commit cf139514 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Sylwester Nawrocki
Browse files

clk: samsung: exynos-clkout: Convert to the new clk_hw API 



Clock providers should use the new struct clk_hw based API, so convert
Exynos CLKOUT clock provider to the new approach.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
parent 5b2c3da1

drivers/clk/samsung/clk-exynos-clkout.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -29,10 +29,9 @@ struct exynos_clkout { 
	struct clk_gate gate;

	struct clk_gate gate;

	struct clk_mux mux;

	struct clk_mux mux;

	spinlock_t slock;

	spinlock_t slock;

	struct clk_onecell_data data;

	struct clk *clk_table[EXYNOS_CLKOUT_NR_CLKS];

	void __iomem *reg;

	void __iomem *reg;

	u32 pmu_debug_save;

	u32 pmu_debug_save;

	struct clk_hw_onecell_data data;

};

};





static struct exynos_clkout *clkout;

static struct exynos_clkout *clkout;
@@ -62,7 +61,9 @@ static void __init exynos_clkout_init(struct device_node *node, u32 mux_mask) 
	int ret;

	int ret;

	int i;

	int i;





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

	clkout = kzalloc(sizeof(*clkout) +

			 sizeof(*clkout->data.hws) * EXYNOS_CLKOUT_NR_CLKS,

			 GFP_KERNEL);

	if (!clkout)

	if (!clkout)

		return;

		return;
@@ -100,17 +101,16 @@ static void __init exynos_clkout_init(struct device_node *node, u32 mux_mask) 
	clkout->mux.shift = EXYNOS_CLKOUT_MUX_SHIFT;

	clkout->mux.shift = EXYNOS_CLKOUT_MUX_SHIFT;

	clkout->mux.lock = &clkout->slock;

	clkout->mux.lock = &clkout->slock;





	clkout->clk_table[0] = clk_register_composite(NULL, "clkout",

	clkout->data.hws[0] = clk_hw_register_composite(NULL, "clkout",

				parent_names, parent_count, &clkout->mux.hw,

				parent_names, parent_count, &clkout->mux.hw,

				&clk_mux_ops, NULL, NULL, &clkout->gate.hw,

				&clk_mux_ops, NULL, NULL, &clkout->gate.hw,

				&clk_gate_ops, CLK_SET_RATE_PARENT

				&clk_gate_ops, CLK_SET_RATE_PARENT

				| CLK_SET_RATE_NO_REPARENT);

				| CLK_SET_RATE_NO_REPARENT);

	if (IS_ERR(clkout->clk_table[0]))

	if (IS_ERR(clkout->data.hws[0]))

		goto err_unmap;

		goto err_unmap;





	clkout->data.clks = clkout->clk_table;

	clkout->data.num = EXYNOS_CLKOUT_NR_CLKS;

	clkout->data.clk_num = EXYNOS_CLKOUT_NR_CLKS;

	ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, &clkout->data);

	ret = of_clk_add_provider(node, of_clk_src_onecell_get, &clkout->data);

	if (ret)

	if (ret)

		goto err_clk_unreg;

		goto err_clk_unreg;
@@ -119,7 +119,7 @@ static void __init exynos_clkout_init(struct device_node *node, u32 mux_mask) 
	return;

	return;





err_clk_unreg:

err_clk_unreg:

	clk_unregister(clkout->clk_table[0]);

	clk_hw_unregister(clkout->data.hws[0]);

err_unmap:

err_unmap:

	iounmap(clkout->reg);

	iounmap(clkout->reg);

clks_put:

clks_put: