These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / jz4740 / time.c

diff --git a/kernel/arch/mips/jz4740/time.c b/kernel/arch/mips/jz4740/time.c
index 72b0cec..1f7ca2c 100644 (file)
--- a/kernel/arch/mips/jz4740/time.c
+++ b/kernel/arch/mips/jz4740/time.c
@@ -13,6 +13,8 @@
  *
  */
 
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/time.h>
@@ -20,6 +22,7 @@
 #include <linux/clockchips.h>
 #include <linux/sched_clock.h>
 
+#include <asm/mach-jz4740/clock.h>
 #include <asm/mach-jz4740/irq.h>
 #include <asm/mach-jz4740/timer.h>
 #include <asm/time.h>
@@ -55,7 +58,7 @@ static irqreturn_t jz4740_clockevent_irq(int irq, void *devid)
 
        jz4740_timer_ack_full(TIMER_CLOCKEVENT);
 
-       if (cd->mode != CLOCK_EVT_MODE_PERIODIC)
+       if (!clockevent_state_periodic(cd))
                jz4740_timer_disable(TIMER_CLOCKEVENT);
 
        cd->event_handler(cd);
@@ -63,24 +66,29 @@ static irqreturn_t jz4740_clockevent_irq(int irq, void *devid)
        return IRQ_HANDLED;
 }
 
-static void jz4740_clockevent_set_mode(enum clock_event_mode mode,
-       struct clock_event_device *cd)
+static int jz4740_clockevent_set_periodic(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               jz4740_timer_set_count(TIMER_CLOCKEVENT, 0);
-               jz4740_timer_set_period(TIMER_CLOCKEVENT, jz4740_jiffies_per_tick);
-       case CLOCK_EVT_MODE_RESUME:
-               jz4740_timer_irq_full_enable(TIMER_CLOCKEVENT);
-               jz4740_timer_enable(TIMER_CLOCKEVENT);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               jz4740_timer_disable(TIMER_CLOCKEVENT);
-               break;
-       default:
-               break;
-       }
+       jz4740_timer_set_count(TIMER_CLOCKEVENT, 0);
+       jz4740_timer_set_period(TIMER_CLOCKEVENT, jz4740_jiffies_per_tick);
+       jz4740_timer_irq_full_enable(TIMER_CLOCKEVENT);
+       jz4740_timer_enable(TIMER_CLOCKEVENT);
+
+       return 0;
+}
+
+static int jz4740_clockevent_resume(struct clock_event_device *evt)
+{
+       jz4740_timer_irq_full_enable(TIMER_CLOCKEVENT);
+       jz4740_timer_enable(TIMER_CLOCKEVENT);
+
+       return 0;
+}
+
+static int jz4740_clockevent_shutdown(struct clock_event_device *evt)
+{
+       jz4740_timer_disable(TIMER_CLOCKEVENT);
+
+       return 0;
 }
 
 static int jz4740_clockevent_set_next(unsigned long evt,
@@ -97,9 +105,17 @@ static struct clock_event_device jz4740_clockevent = {
        .name = "jz4740-timer",
        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
        .set_next_event = jz4740_clockevent_set_next,
-       .set_mode = jz4740_clockevent_set_mode,
+       .set_state_shutdown = jz4740_clockevent_shutdown,
+       .set_state_periodic = jz4740_clockevent_set_periodic,
+       .set_state_oneshot = jz4740_clockevent_shutdown,
+       .tick_resume = jz4740_clockevent_resume,
        .rating = 200,
+#ifdef CONFIG_MACH_JZ4740
        .irq = JZ4740_IRQ_TCU0,
+#endif
+#ifdef CONFIG_MACH_JZ4780
+       .irq = JZ4780_IRQ_TCU2,
+#endif
 };
 
 static struct irqaction timer_irqaction = {
@@ -114,10 +130,17 @@ void __init plat_time_init(void)
        int ret;
        uint32_t clk_rate;
        uint16_t ctrl;
+       struct clk *ext_clk;
 
+       of_clk_init(NULL);
        jz4740_timer_init();
 
-       clk_rate = jz4740_clock_bdata.ext_rate >> 4;
+       ext_clk = clk_get(NULL, "ext");
+       if (IS_ERR(ext_clk))
+               panic("unable to get ext clock");
+       clk_rate = clk_get_rate(ext_clk) >> 4;
+       clk_put(ext_clk);
+
        jz4740_jiffies_per_tick = DIV_ROUND_CLOSEST(clk_rate, HZ);
 
        clockevent_set_clock(&jz4740_clockevent, clk_rate);
@@ -134,7 +157,7 @@ void __init plat_time_init(void)
 
        sched_clock_register(jz4740_read_sched_clock, 16, clk_rate);
 
-       setup_irq(JZ4740_IRQ_TCU0, &timer_irqaction);
+       setup_irq(jz4740_clockevent.irq, &timer_irqaction);
 
        ctrl = JZ_TIMER_CTRL_PRESCALE_16 | JZ_TIMER_CTRL_SRC_EXT;