Merge branch 'clockevents/4.4' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core

clockevent updates from Daniel Lezcano:

 - Remove unneeded memset in em_sti, sh_cmt and h8300 because there are already
   zeroed by a kzalloc (Alexey Klimov)

 - Optimize code by replacing this_cpu_ptr by container_of on the exynos_mct (Alexey
   Klimov)

 - Get immune from a spurious interrupt when enabling the mtk_timer (Daniel Lezcano)

 - Use the dynamic irq affinity to optimize wakeup and useless IPI timer on the imx
   timer (Lucas Stach)

 - Add new timer for Tango SoCs (Marc Gonzalez)

 - Implement the timer delay for armada-370-xp (Russell King)

 - Use GPT as clock source (Yingjoe Chen)

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 839aba92fc39..99ec96769dda 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -305,13 +305,14 @@ static int __init mxc_clockevent_init(struct imx_timer *imxtm)
         struct irqaction *act = &imxtm->act;
 
         ced->name = "mxc_timer1";
-        ced->features = CLOCK_EVT_FEAT_ONESHOT;
+        ced->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_DYNIRQ;
         ced->set_state_shutdown = mxc_shutdown;
         ced->set_state_oneshot = mxc_set_oneshot;
         ced->tick_resume = mxc_shutdown;
         ced->set_next_event = imxtm->gpt->set_next_event;
         ced->rating = 200;
         ced->cpumask = cpumask_of(0);
+        ced->irq = imxtm->irq;
         clockevents_config_and_register(ced, clk_get_rate(imxtm->clk_per),
                                         0xff, 0xfffffffe);