Skip to content

Commit 874b300

Browse files
committed
ARM: OMAP2+: Fix booting if no timer parent clock is available
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]>
1 parent fe8291e commit 874b300

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

arch/arm/mach-omap2/timer.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
297297
if (IS_ERR(src))
298298
return PTR_ERR(src);
299299

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

307303
clk_put(src);
308304

0 commit comments

Comments
 (0)