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

Commit d2f18d7e authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Michael Turquette
Browse files

clk: samsung: Add support for runtime PM 



This patch adds struct device pointer to samsung_clk_provider and forwarding it
to clk_register_* functions, so drivers can register clocks, which use runtime
pm feature.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMichael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1503302703-13801-3-git-send-email-m.szyprowski@samsung.com
parent 9a34b453

drivers/clk/samsung/clk-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, 
	pll->lock_reg = base + pll_clk->lock_offset;

	pll->con_reg = base + pll_clk->con_offset;



	ret = clk_hw_register(NULL, &pll->hw);

	ret = clk_hw_register(ctx->dev, &pll->hw);

	if (ret) {

		pr_err("%s: failed to register pll clock %s : %d\n",

			__func__, pll_clk->name, ret);

drivers/clk/samsung/clk.c

+6 −6
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void __init samsung_clk_register_fixed_rate(struct samsung_clk_provider *ctx, 
	unsigned int idx, ret;



	for (idx = 0; idx < nr_clk; idx++, list++) {

		clk_hw = clk_hw_register_fixed_rate(NULL, list->name,

		clk_hw = clk_hw_register_fixed_rate(ctx->dev, list->name,

			list->parent_name, list->flags, list->fixed_rate);

		if (IS_ERR(clk_hw)) {

			pr_err("%s: failed to register clock %s\n", __func__,
@@ -163,7 +163,7 @@ void __init samsung_clk_register_fixed_factor(struct samsung_clk_provider *ctx, 
	unsigned int idx;



	for (idx = 0; idx < nr_clk; idx++, list++) {

		clk_hw = clk_hw_register_fixed_factor(NULL, list->name,

		clk_hw = clk_hw_register_fixed_factor(ctx->dev, list->name,

			list->parent_name, list->flags, list->mult, list->div);

		if (IS_ERR(clk_hw)) {

			pr_err("%s: failed to register clock %s\n", __func__,
@@ -184,7 +184,7 @@ void __init samsung_clk_register_mux(struct samsung_clk_provider *ctx, 
	unsigned int idx, ret;



	for (idx = 0; idx < nr_clk; idx++, list++) {

		clk_hw = clk_hw_register_mux(NULL, list->name,

		clk_hw = clk_hw_register_mux(ctx->dev, list->name,

			list->parent_names, list->num_parents, list->flags,

			ctx->reg_base + list->offset,

			list->shift, list->width, list->mux_flags, &ctx->lock);
@@ -217,13 +217,13 @@ void __init samsung_clk_register_div(struct samsung_clk_provider *ctx, 


	for (idx = 0; idx < nr_clk; idx++, list++) {

		if (list->table)

			clk_hw = clk_hw_register_divider_table(NULL,

			clk_hw = clk_hw_register_divider_table(ctx->dev,

				list->name, list->parent_name, list->flags,

				ctx->reg_base + list->offset,

				list->shift, list->width, list->div_flags,

				list->table, &ctx->lock);

		else

			clk_hw = clk_hw_register_divider(NULL, list->name,

			clk_hw = clk_hw_register_divider(ctx->dev, list->name,

				list->parent_name, list->flags,

				ctx->reg_base + list->offset, list->shift,

				list->width, list->div_flags, &ctx->lock);
@@ -255,7 +255,7 @@ void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx, 
	unsigned int idx, ret;



	for (idx = 0; idx < nr_clk; idx++, list++) {

		clk_hw = clk_hw_register_gate(NULL, list->name, list->parent_name,

		clk_hw = clk_hw_register_gate(ctx->dev, list->name, list->parent_name,

				list->flags, ctx->reg_base + list->offset,

				list->bit_idx, list->gate_flags, &ctx->lock);

		if (IS_ERR(clk_hw)) {

drivers/clk/samsung/clk.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 */

struct samsung_clk_provider {

	void __iomem *reg_base;

	struct device *dev;

	spinlock_t lock;

	/* clk_data must be the last entry due to variable lenght 'hws' array */

	struct clk_hw_onecell_data clk_data;