Skip to content

Commit

Permalink
ARM: OMAP2+: Fix booting if no timer parent clock is available
Browse files Browse the repository at this point in the history
When bringing up a new SoC we needlessly prevent booting at timer
init if timer clock_set_parent fails. This can fail if the system
is booting on bootloader configured PLL values until the clock
framework driver for the PLL is implemented.

Let's just WARN instead, this will provide helpful information
for anybody bringing up a new SoC what needs to be fixed.

This allows to boot dm814x that's still missing the PLL driver.

Signed-off-by: Tony Lindgren <[email protected]>
  • Loading branch information
tmlind committed Sep 1, 2015
1 parent fe8291e commit 874b300
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/arm/mach-omap2/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
if (IS_ERR(src))
return PTR_ERR(src);

r = clk_set_parent(timer->fclk, src);
if (r < 0) {
pr_warn("%s: %s cannot set source\n", __func__, oh->name);
clk_put(src);
return r;
}
WARN(clk_set_parent(timer->fclk, src) < 0,
"Cannot set timer parent clock, no PLL clock driver?");

clk_put(src);

Expand Down

0 comments on commit 874b300

Please sign in to comment.