[2/2] clocksource/mtu-nomadik: use apb_pclk

Message ID 1352987738-9422-1-git-send-email-linus.walleij@stericsson.com
State Accepted
Commit 16defa668d009a762e23d55ce6ecf5ae483dfe10
Headers show

Commit Message

Linus Walleij Nov. 15, 2012, 1:55 p.m.
From: Ulf Hansson <ulf.hansson@linaro.org>

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>
---
This version of the patch is based upon the ux500
SPARSE_IRQ commit and is intended to be merged after [1/2]
so as to avoid conflicts between the clk and ARM SoC trees.
---
 drivers/clocksource/nomadik-mtu.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Patch

diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index 23c780b..8914c3c 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);