diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-07-27 13:56:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-07-27 13:56:57 -0700 |
| commit | 5c62202968d4aaf3bd50e19c421d66aec2e508e0 (patch) | |
| tree | 925d3102051db9664772911f29a59155825c671d /arch/arm/mach-omap2/timer.c | |
| parent | Linux 3.5 (diff) | |
| parent | ARM: OMAP4: CPUidle: Open broadcast clock-event device. (diff) | |
| download | wireguard-linux-5c62202968d4aaf3bd50e19c421d66aec2e508e0.tar.xz wireguard-linux-5c62202968d4aaf3bd50e19c421d66aec2e508e0.zip | |
Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into late2/pm
* 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm:
ARM: OMAP4: CPUidle: Open broadcast clock-event device.
ARM: OMAP4: CPUidle: add synchronization for coupled idle states
ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 840929bd9dae..9b7a07360610 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -135,6 +135,7 @@ static struct clock_event_device clockevent_gpt = { .name = "gp_timer", .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .shift = 32, + .rating = 300, .set_next_event = omap2_gp_timer_set_next_event, .set_mode = omap2_gp_timer_set_mode, }; @@ -228,7 +229,8 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, clockevent_delta2ns(3, &clockevent_gpt); /* Timer internal resynch latency. */ - clockevent_gpt.cpumask = cpumask_of(0); + clockevent_gpt.cpumask = cpu_possible_mask; + clockevent_gpt.irq = omap_dm_timer_get_irq(&clkev); clockevents_register_device(&clockevent_gpt); pr_info("OMAP clockevent source: GPTIMER%d at %lu Hz\n", |