Commit 6c724d43 authored by Viresh Kumar's avatar Viresh Kumar

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

Migrate w90x900 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: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 7639c0b8
...@@ -48,31 +48,32 @@ ...@@ -48,31 +48,32 @@
static unsigned int timer0_load; static unsigned int timer0_load;
static void nuc900_clockevent_setmode(enum clock_event_mode mode, static int nuc900_clockevent_shutdown(struct clock_event_device *evt)
struct clock_event_device *clk)
{ {
unsigned int val; unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27);
val = __raw_readl(REG_TCSR0); __raw_writel(val, REG_TCSR0);
val &= ~(0x03 << 27); return 0;
}
static int nuc900_clockevent_set_oneshot(struct clock_event_device *evt)
{
unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27);
switch (mode) { val |= (ONESHOT | COUNTEN | INTEN | PRESCALE);
case CLOCK_EVT_MODE_PERIODIC:
__raw_writel(timer0_load, REG_TICR0);
val |= (PERIOD | COUNTEN | INTEN | PRESCALE);
break;
case CLOCK_EVT_MODE_ONESHOT: __raw_writel(val, REG_TCSR0);
val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); return 0;
break; }
case CLOCK_EVT_MODE_UNUSED: static int nuc900_clockevent_set_periodic(struct clock_event_device *evt)
case CLOCK_EVT_MODE_SHUTDOWN: {
case CLOCK_EVT_MODE_RESUME: unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27);
break;
}
__raw_writel(timer0_load, REG_TICR0);
val |= (PERIOD | COUNTEN | INTEN | PRESCALE);
__raw_writel(val, REG_TCSR0); __raw_writel(val, REG_TCSR0);
return 0;
} }
static int nuc900_clockevent_setnextevent(unsigned long evt, static int nuc900_clockevent_setnextevent(unsigned long evt,
...@@ -90,11 +91,15 @@ static int nuc900_clockevent_setnextevent(unsigned long evt, ...@@ -90,11 +91,15 @@ static int nuc900_clockevent_setnextevent(unsigned long evt,
} }
static struct clock_event_device nuc900_clockevent_device = { static struct clock_event_device nuc900_clockevent_device = {
.name = "nuc900-timer0", .name = "nuc900-timer0",
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_PERIODIC |
.set_mode = nuc900_clockevent_setmode, CLOCK_EVT_FEAT_ONESHOT,
.set_next_event = nuc900_clockevent_setnextevent, .set_state_shutdown = nuc900_clockevent_shutdown,
.rating = 300, .set_state_periodic = nuc900_clockevent_set_periodic,
.set_state_oneshot = nuc900_clockevent_set_oneshot,
.tick_resume = nuc900_clockevent_shutdown,
.set_next_event = nuc900_clockevent_setnextevent,
.rating = 300,
}; };
/*IRQ handler for the timer*/ /*IRQ handler for the timer*/
......
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