m68k/coldfire/pit: Migrate to new 'set-state' interface
Migrate m68k 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. We weren't doing anything in ->set_mode(RESUME) and so tick_resume() isn't implemented. Cc: Greg Ungerer <gerg@uclinux.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
parent
c13dcf9f2d
commit
5bbc08fb0f
|
@ -42,37 +42,28 @@ static u32 pit_cnt;
|
|||
* This is also called after resume to bring the PIT into operation again.
|
||||
*/
|
||||
|
||||
static void init_cf_pit_timer(enum clock_event_mode mode,
|
||||
struct clock_event_device *evt)
|
||||
static int cf_pit_set_periodic(struct clock_event_device *evt)
|
||||
{
|
||||
switch (mode) {
|
||||
case CLOCK_EVT_MODE_PERIODIC:
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
__raw_writew(PIT_CYCLES_PER_JIFFY, TA(MCFPIT_PMR));
|
||||
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE |
|
||||
MCFPIT_PCSR_OVW | MCFPIT_PCSR_RLD |
|
||||
MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
|
||||
return 0;
|
||||
}
|
||||
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
__raw_writew(PIT_CYCLES_PER_JIFFY, TA(MCFPIT_PMR));
|
||||
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | \
|
||||
MCFPIT_PCSR_OVW | MCFPIT_PCSR_RLD | \
|
||||
MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
|
||||
break;
|
||||
static int cf_pit_set_oneshot(struct clock_event_device *evt)
|
||||
{
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE |
|
||||
MCFPIT_PCSR_OVW | MCFPIT_PCSR_CLK64, TA(MCFPIT_PCSR));
|
||||
return 0;
|
||||
}
|
||||
|
||||
case CLOCK_EVT_MODE_SHUTDOWN:
|
||||
case CLOCK_EVT_MODE_UNUSED:
|
||||
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
break;
|
||||
|
||||
case CLOCK_EVT_MODE_ONESHOT:
|
||||
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
__raw_writew(MCFPIT_PCSR_EN | MCFPIT_PCSR_PIE | \
|
||||
MCFPIT_PCSR_OVW | MCFPIT_PCSR_CLK64, \
|
||||
TA(MCFPIT_PCSR));
|
||||
break;
|
||||
|
||||
case CLOCK_EVT_MODE_RESUME:
|
||||
/* Nothing to do here */
|
||||
break;
|
||||
}
|
||||
static int cf_pit_shutdown(struct clock_event_device *evt)
|
||||
{
|
||||
__raw_writew(MCFPIT_PCSR_DISABLE, TA(MCFPIT_PCSR));
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -88,12 +79,15 @@ static int cf_pit_next_event(unsigned long delta,
|
|||
}
|
||||
|
||||
struct clock_event_device cf_pit_clockevent = {
|
||||
.name = "pit",
|
||||
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
|
||||
.set_mode = init_cf_pit_timer,
|
||||
.set_next_event = cf_pit_next_event,
|
||||
.shift = 32,
|
||||
.irq = MCF_IRQ_PIT1,
|
||||
.name = "pit",
|
||||
.features = CLOCK_EVT_FEAT_PERIODIC |
|
||||
CLOCK_EVT_FEAT_ONESHOT,
|
||||
.set_state_shutdown = cf_pit_shutdown,
|
||||
.set_state_periodic = cf_pit_set_periodic,
|
||||
.set_state_oneshot = cf_pit_set_oneshot,
|
||||
.set_next_event = cf_pit_next_event,
|
||||
.shift = 32,
|
||||
.irq = MCF_IRQ_PIT1,
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue