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, 16 insertions, 10 deletions

diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c
index 50f0641c65b6..fbfc74685e6a 100644
--- a/drivers/clocksource/mtk_timer.c
+++ b/drivers/clocksource/mtk_timer.c
@@ -24,6 +24,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/sched_clock.h>
 #include <linux/slab.h>
 
 #define GPT_IRQ_EN_REG          0x00
@@ -59,6 +60,13 @@ struct mtk_clock_event_device {
         struct clock_event_device dev;
 };
 
+static void __iomem *gpt_sched_reg __read_mostly;
+
+static u64 notrace mtk_read_sched_clock(void)
+{
+        return readl_relaxed(gpt_sched_reg);
+}
+
 static inline struct mtk_clock_event_device *to_mtk_clk(
                                 struct clock_event_device *c)
 {
@@ -141,14 +149,6 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static void mtk_timer_global_reset(struct mtk_clock_event_device *evt)
-{
-        /* Disable all interrupts */
-        writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
-        /* Acknowledge all interrupts */
-        writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
-}
-
 static void
 mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
 {
@@ -168,6 +168,12 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
 {
         u32 val;
 
+        /* Disable all interrupts */
+        writel(0x0, evt->gpt_base + GPT_IRQ_EN_REG);
+
+        /* Acknowledge all spurious pending interrupts */
+        writel(0x3f, evt->gpt_base + GPT_IRQ_ACK_REG);
+
         val = readl(evt->gpt_base + GPT_IRQ_EN_REG);
         writel(val | GPT_IRQ_ENABLE(timer),
                         evt->gpt_base + GPT_IRQ_EN_REG);
@@ -220,8 +226,6 @@ static void __init mtk_timer_init(struct device_node *node)
         }
         rate = clk_get_rate(clk);
 
-        mtk_timer_global_reset(evt);
-
         if (request_irq(evt->dev.irq, mtk_timer_interrupt,
                         IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {
                 pr_warn("failed to setup irq %d\n", evt->dev.irq);
@@ -234,6 +238,8 @@ static void __init mtk_timer_init(struct device_node *node)
         mtk_timer_setup(evt, GPT_CLK_SRC, TIMER_CTRL_OP_FREERUN);
         clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC),
                         node->name, rate, 300, 32, clocksource_mmio_readl_up);
+        gpt_sched_reg = evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC);
+        sched_clock_register(mtk_read_sched_clock, 32, rate);
 
         /* Configure clock event */
         mtk_timer_setup(evt, GPT_CLK_EVT, TIMER_CTRL_OP_REPEAT);