diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-27 22:04:40 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-27 22:04:40 +0100 |
| commit | 29f141fed01a09050207c4d41fc5811520d81146 (patch) | |
| tree | c55a51dca4a0e4da9fdc2b904eefbde37d2a5b03 /arch/sparc/kernel/sun4m_irq.c | |
| parent | dt: add empty of_find_compatible_node function (diff) | |
| parent | doc: dt: Fix broken reference in gpio-leds documentation (diff) | |
| download | linux-29f141fed01a09050207c4d41fc5811520d81146.tar.xz linux-29f141fed01a09050207c4d41fc5811520d81146.zip | |
Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'arch/sparc/kernel/sun4m_irq.c')
| -rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index 422c16dad1f6..e61165161dd3 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c @@ -399,6 +399,9 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) timers_global = (void __iomem *) (unsigned long) addr[num_cpu_timers]; + /* Every per-cpu timer works in timer mode */ + sbus_writel(0x00000000, &timers_global->timer_config); + sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit); master_l10_counter = &timers_global->l10_count; |