luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clockevents/drivers/rockchip: Migrate to new 'set-state' interface

Browse Source 
Migrate rockchip 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 for oneshot or resume modes, and so the
callbacks aren't provided.

Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Viresh Kumar 2015-06-18 16:24:32 +05:30 committed by Daniel Lezcano
parent 736b2df2ab
commit 99b3fa72ef
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/clocksource/rockchip_timer.c
View File

@ -82,23 +82,18 @@ static inline int rk_timer_set_next_event(unsigned long cycles,
return 0; return 0;
} }
static inline void rk_timer_set_mode(enum clock_event_mode mode, static int rk_timer_shutdown(struct clock_event_device *ce)
struct clock_event_device *ce) {
rk_timer_disable(ce);
return 0;
}
static int rk_timer_set_periodic(struct clock_event_device *ce)
{ {
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
rk_timer_disable(ce); rk_timer_disable(ce);
rk_timer_update_counter(rk_timer(ce)->freq / HZ - 1, ce); rk_timer_update_counter(rk_timer(ce)->freq / HZ - 1, ce);
rk_timer_enable(ce, TIMER_MODE_FREE_RUNNING); rk_timer_enable(ce, TIMER_MODE_FREE_RUNNING);
break; return 0;
case CLOCK_EVT_MODE_ONESHOT:
case CLOCK_EVT_MODE_RESUME:
break;
case CLOCK_EVT_MODE_UNUSED:
case CLOCK_EVT_MODE_SHUTDOWN:
rk_timer_disable(ce);
break;
}
} }
static irqreturn_t rk_timer_interrupt(int irq, void *dev_id) static irqreturn_t rk_timer_interrupt(int irq, void *dev_id)
@ -107,7 +102,7 @@ static irqreturn_t rk_timer_interrupt(int irq, void *dev_id)
rk_timer_interrupt_clear(ce); rk_timer_interrupt_clear(ce);
if (ce->mode == CLOCK_EVT_MODE_ONESHOT) if (clockevent_state_oneshot(ce))
rk_timer_disable(ce); rk_timer_disable(ce);
ce->event_handler(ce); ce->event_handler(ce);
@ -161,7 +156,8 @@ static void __init rk_timer_init(struct device_node *np)
ce->name = TIMER_NAME; ce->name = TIMER_NAME;
ce->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; ce->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
ce->set_next_event = rk_timer_set_next_event; ce->set_next_event = rk_timer_set_next_event;
ce->set_mode = rk_timer_set_mode; ce->set_state_shutdown = rk_timer_shutdown;
ce->set_state_periodic = rk_timer_set_periodic;
ce->irq = irq; ce->irq = irq;
ce->cpumask = cpumask_of(0); ce->cpumask = cpumask_of(0);
ce->rating = 250; ce->rating = 250;