Commit 8d778377 authored by Viresh Kumar's avatar Viresh Kumar

ARM/iop/time: Migrate to new 'set-state' interface

Migrate iop 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.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 6c724d43
...@@ -77,41 +77,57 @@ static int iop_set_next_event(unsigned long delta, ...@@ -77,41 +77,57 @@ static int iop_set_next_event(unsigned long delta,
static unsigned long ticks_per_jiffy; static unsigned long ticks_per_jiffy;
static void iop_set_mode(enum clock_event_mode mode, static int iop_set_periodic(struct clock_event_device *evt)
struct clock_event_device *unused)
{ {
u32 tmr = read_tmr0(); u32 tmr = read_tmr0();
switch (mode) { write_tmr0(tmr & ~IOP_TMR_EN);
case CLOCK_EVT_MODE_PERIODIC: write_tcr0(ticks_per_jiffy - 1);
write_tmr0(tmr & ~IOP_TMR_EN); write_trr0(ticks_per_jiffy - 1);
write_tcr0(ticks_per_jiffy - 1); tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
write_trr0(ticks_per_jiffy - 1);
tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
break;
case CLOCK_EVT_MODE_ONESHOT:
/* ->set_next_event sets period and enables timer */
tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
break;
case CLOCK_EVT_MODE_RESUME:
tmr |= IOP_TMR_EN;
break;
case CLOCK_EVT_MODE_SHUTDOWN:
case CLOCK_EVT_MODE_UNUSED:
default:
tmr &= ~IOP_TMR_EN;
break;
}
write_tmr0(tmr); write_tmr0(tmr);
return 0;
}
static int iop_set_oneshot(struct clock_event_device *evt)
{
u32 tmr = read_tmr0();
/* ->set_next_event sets period and enables timer */
tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
write_tmr0(tmr);
return 0;
}
static int iop_shutdown(struct clock_event_device *evt)
{
u32 tmr = read_tmr0();
tmr &= ~IOP_TMR_EN;
write_tmr0(tmr);
return 0;
}
static int iop_resume(struct clock_event_device *evt)
{
u32 tmr = read_tmr0();
tmr |= IOP_TMR_EN;
write_tmr0(tmr);
return 0;
} }
static struct clock_event_device iop_clockevent = { static struct clock_event_device iop_clockevent = {
.name = "iop_timer0", .name = "iop_timer0",
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_PERIODIC |
.rating = 300, CLOCK_EVT_FEAT_ONESHOT,
.set_next_event = iop_set_next_event, .rating = 300,
.set_mode = iop_set_mode, .set_next_event = iop_set_next_event,
.set_state_shutdown = iop_shutdown,
.set_state_periodic = iop_set_periodic,
.tick_resume = iop_resume,
.set_state_oneshot = iop_set_oneshot,
}; };
static irqreturn_t static irqreturn_t
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment