MIPS: jz4740: Migrate to new 'set-state' interface
Migrate jz4740 driver to the new 'set-state' interface provided by clockevents core, the earlier 'set-mode' interface is marked obsolete now. This also enables us to implement callbacks for new states of clockevent devices, for example: ONESHOT_STOPPED. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-mips@linux-mips.org Cc: linaro-kernel@lists.linaro.org Cc: Thomas Gleixner <tglx@linutronix.de> Patchwork: https://patchwork.linux-mips.org/patch/10601/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
20a7835f8f
commit
c87cbe0691
|
@ -58,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);
|
||||
|
@ -66,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,
|
||||
|
@ -100,7 +105,10 @@ 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,
|
||||
|
|
Loading…
Reference in a new issue