From 61b0111e48a80895d6c8e67040c5db6fc5f1b904 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 6 Sep 2011 08:08:13 +0100 Subject: [PATCH] --- yaml --- r: 263711 b: refs/heads/master c: bb9ea77846620ed2b37e74c852d72c7a476b248c h: refs/heads/master i: 263709: 56b0474d86b182025b00b4cfc2dd897532c40508 263707: ef77cf5e27eda9355ae16744702cec864eed346d 263703: 24ed5e98a581f05d6b22ab0b60e2c610607d40e3 263695: 88c849f489f3145a82f56c6497974c4c85237775 263679: 9b318b91cac13ec4f1a72906664d6aaf2ee7aab4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_ap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 73cd4fc40079..a54bab978305 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1df726ef0a700587a712a3660b2caa8e533c7de9 +refs/heads/master: bb9ea77846620ed2b37e74c852d72c7a476b248c diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index 2fbbdd5eac35..fcf0ae95651f 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/arch/arm/mach-integrator/integrator_ap.c @@ -337,15 +337,15 @@ static unsigned long timer_reload; static void integrator_clocksource_init(u32 khz) { void __iomem *base = (void __iomem *)TIMER2_VA_BASE; - u32 ctrl = TIMER_CTRL_ENABLE; + u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC; if (khz >= 1500) { khz /= 16; - ctrl = TIMER_CTRL_DIV16; + ctrl |= TIMER_CTRL_DIV16; } - writel(ctrl, base + TIMER_CTRL); writel(0xffff, base + TIMER_LOAD); + writel(ctrl, base + TIMER_CTRL); clocksource_mmio_init(base + TIMER_VALUE, "timer2", khz * 1000, 200, 16, clocksource_mmio_readl_down);