openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM/dc21285-timer: Migrate to new 'set-state' interface 

Migrate footbridge 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: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Viresh Kumar 2015-02-27 13:39:52 +05:30
parent bc660a454f
commit 947d9cf53f
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arch/arm/mach-footbridge/dc21285-timer.c
View File

@ -57,34 +57,32 @@ static int ckevt_dc21285_set_next_event(unsigned long delta,
return 0; return 0;
} }
static void ckevt_dc21285_set_mode(enum clock_event_mode mode, static int ckevt_dc21285_shutdown(struct clock_event_device *c)
struct clock_event_device *c)
{ {
switch (mode) { *CSR_TIMER1_CNTL = 0;
case CLOCK_EVT_MODE_RESUME: return 0;
case CLOCK_EVT_MODE_PERIODIC: }
*CSR_TIMER1_CLR = 0;
*CSR_TIMER1_LOAD = (mem_fclk_21285 + 8 * HZ) / (16 * HZ);
*CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD |
TIMER_CNTL_DIV16;
break;
case CLOCK_EVT_MODE_ONESHOT: static int ckevt_dc21285_set_periodic(struct clock_event_device *c)
case CLOCK_EVT_MODE_UNUSED: {
case CLOCK_EVT_MODE_SHUTDOWN: *CSR_TIMER1_CLR = 0;
*CSR_TIMER1_CNTL = 0; *CSR_TIMER1_LOAD = (mem_fclk_21285 + 8 * HZ) / (16 * HZ);
break; *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD |
} TIMER_CNTL_DIV16;
return 0;
} }
static struct clock_event_device ckevt_dc21285 = { static struct clock_event_device ckevt_dc21285 = {
.name = "dc21285_timer1", .name = "dc21285_timer1",
.features = CLOCK_EVT_FEAT_PERIODIC | .features = CLOCK_EVT_FEAT_PERIODIC |
CLOCK_EVT_FEAT_ONESHOT, CLOCK_EVT_FEAT_ONESHOT,
.rating = 200, .rating = 200,
.irq = IRQ_TIMER1, .irq = IRQ_TIMER1,
.set_next_event = ckevt_dc21285_set_next_event, .set_next_event = ckevt_dc21285_set_next_event,
.set_mode = ckevt_dc21285_set_mode, .set_state_shutdown = ckevt_dc21285_shutdown,
.set_state_periodic = ckevt_dc21285_set_periodic,
.set_state_oneshot = ckevt_dc21285_shutdown,
.tick_resume = ckevt_dc21285_set_periodic,
}; };
static irqreturn_t timer1_interrupt(int irq, void *dev_id) static irqreturn_t timer1_interrupt(int irq, void *dev_id)
@ -94,7 +92,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)
*CSR_TIMER1_CLR = 0; *CSR_TIMER1_CLR = 0;
/* Stop the timer if in one-shot mode */ /* Stop the timer if in one-shot mode */
if (ce->mode == CLOCK_EVT_MODE_ONESHOT) if (clockevent_state_oneshot(ce))
*CSR_TIMER1_CNTL = 0; *CSR_TIMER1_CNTL = 0;
ce->event_handler(ce); ce->event_handler(ce);