summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-01-11 09:51:14 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-01-31 00:05:28 +0100
commitd3e8b7569ad733c063a95dc1a51928e6e7c40652 (patch)
tree15bb43211140a336a1cc6e366af437117da69124 /arch/arm
parentb9576623c4217a5d753c272158e1e108c25a1a57 (diff)
ARM: plat-nomadik: handle clocking properly
clk_prepare() was missing from the Nomadik MTU driver, also handle errors on prepare and enable in the simplest way possible, by bugging out - we cannot start the system without time anyway. Acked-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-nomadik/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c
index 46f50f24205..954a862ec4a 100644
--- a/arch/arm/plat-nomadik/timer.c
+++ b/arch/arm/plat-nomadik/timer.c
@@ -190,8 +190,8 @@ void __init nmdk_timer_init(void __iomem *base)
mtu_base = base;
clk0 = clk_get_sys("mtu0", NULL);
BUG_ON(IS_ERR(clk0));
-
- clk_enable(clk0);
+ BUG_ON(clk_prepare(clk0) < 0);
+ BUG_ON(clk_enable(clk0) < 0);
/*
* Tick rate is 2.4MHz for Nomadik and 2.4Mhz, 100MHz or 133 MHz