Commit b0897972 authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP2+: Remove bogus struct clk comparison for timer clock

With recent changes to use determine_rate, the comparison of two
clocks won't work without clk_is_match that does __clk_get_hw
on the clocks first.

As we've been unconditionally already calling clk_set_parent
already because of the bogus comparison, let's just remove the
check as suggested by Stephen Boyd <sboyd@codeaurora.org>.

Cc: Michael Turquette <mturquette@linaro.org>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e7309c26
...@@ -298,14 +298,11 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, ...@@ -298,14 +298,11 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
if (IS_ERR(src)) if (IS_ERR(src))
return PTR_ERR(src); return PTR_ERR(src);
if (clk_get_parent(timer->fclk) != src) { r = clk_set_parent(timer->fclk, src);
r = clk_set_parent(timer->fclk, src); if (r < 0) {
if (r < 0) { pr_warn("%s: %s cannot set source\n", __func__, oh->name);
pr_warn("%s: %s cannot set source\n", __func__, clk_put(src);
oh->name); return r;
clk_put(src);
return r;
}
} }
clk_put(src); clk_put(src);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment