From e5deb3887f0b44a0f34fa2242bfd2d104c38c913 Mon Sep 17 00:00:00 2001 From: Ulf Hansson Date: Wed, 24 Oct 2012 14:13:41 +0200 Subject: [PATCH] --- yaml --- r: 342391 b: refs/heads/master c: 16defa668d009a762e23d55ce6ecf5ae483dfe10 h: refs/heads/master i: 342389: 011d000b99289f33068ead4afca8ba5c164988f3 342387: 7cbff1d818d763a23ded97c33607361d9f401af8 342383: 0836e99f6a7eac60d490f602489c973c806ab1cf v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/nomadik-mtu.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5e40f4d49af6..9c2dc2538b8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db5eb2daf717d5023ade51fd2a2f7bc0bfcffbde +refs/heads/master: 16defa668d009a762e23d55ce6ecf5ae483dfe10 diff --git a/trunk/drivers/clocksource/nomadik-mtu.c b/trunk/drivers/clocksource/nomadik-mtu.c index 23c780ba0d35..8914c3c1c88b 100644 --- a/trunk/drivers/clocksource/nomadik-mtu.c +++ b/trunk/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);