summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2012-10-24 14:13:41 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-11-16 14:44:02 +0100
commit16defa668d009a762e23d55ce6ecf5ae483dfe10 (patch)
tree246643490b7b202caa9e930fdad41a495e10590f /drivers/clocksource
parentclk: ux500: Register mtu apb_pclocks (diff)
downloadlinux-16defa668d009a762e23d55ce6ecf5ae483dfe10.tar.xz
linux-16defa668d009a762e23d55ce6ecf5ae483dfe10.zip
clocksource/mtu-nomadik: use apb_pclk
After improving the clock tree we need to make sure the the MTU timer explicitly grabs and enables it silicon clock (pclk). Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Mike Turquette <mturquette@ti.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/nomadik-mtu.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index 23c780ba0d35..8914c3c1c88b 100644
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@ -177,9 +177,15 @@ void nmdk_clksrc_reset(void)
void __init nmdk_timer_init(void __iomem *base, int irq)
{
unsigned long rate;
- struct clk *clk0;
+ struct clk *clk0, *pclk0;
mtu_base = base;
+
+ pclk0 = clk_get_sys("mtu0", "apb_pclk");
+ BUG_ON(IS_ERR(pclk0));
+ BUG_ON(clk_prepare(pclk0) < 0);
+ BUG_ON(clk_enable(pclk0) < 0);
+
clk0 = clk_get_sys("mtu0", NULL);
BUG_ON(IS_ERR(clk0));
BUG_ON(clk_prepare(clk0) < 0);