summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
authorTony Lindgren2015-09-01 22:59:25 +0200
committerTony Lindgren2015-09-01 22:59:25 +0200
commit874b300a6a0bfe97225ed1f8648fa92238e4d9e9 (patch)
treec9cf5fda3f7edb2fbfcf3f0dbcb5621076b32dea /arch/arm/mach-omap2/timer.c
parentARM: OMAP2+: omap-device: fix race deferred probe of omap_hsmmc vs omap_devic... (diff)
downloadkernel-qcow2-linux-874b300a6a0bfe97225ed1f8648fa92238e4d9e9.tar.gz
kernel-qcow2-linux-874b300a6a0bfe97225ed1f8648fa92238e4d9e9.tar.xz
kernel-qcow2-linux-874b300a6a0bfe97225ed1f8648fa92238e4d9e9.zip
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 <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index e4d8701f99f9..a55655127ef2 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -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);