aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>2010-06-16 16:59:00 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:36 -0600
commit42c9995516bad160b8a22b7e2438d22cae876048 (patch)
tree742a9464724181d39976ddafac9f027cdb142804 /arch
parent77be3e1f4ecbed12bbfbe46f3d7655b8d7affdfa (diff)
downloadlinux-2.6.34-ux500-42c9995516bad160b8a22b7e2438d22cae876048.tar.gz
twd: add CLOCK_EVT_FEAT_C3STOP to timer features
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: I1fb7dea289aee0a97cb9e4ed3cc26c1727dfa882 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2419 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/smp_twd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 7c5f0c024db..c47fcecb524 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -132,7 +132,13 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
twd_calibrate_rate();
clk->name = "local_timer";
+#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && \
+ defined(CONFIG_LOCAL_TIMERS)
+ clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
+ CLOCK_EVT_FEAT_C3STOP;
+#else
clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
+#endif
clk->rating = 350;
clk->set_mode = twd_set_mode;
clk->set_next_event = twd_set_next_event;