mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Migrate orion 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: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
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:42 +05:30 committed by Daniel Lezcano
parent 20bf54f117
commit 5dd2482c8e
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/clocksource/time-orion.c
View file

@ -60,30 +60,36 @@ static int orion_clkevt_next_event(unsigned long delta,
return 0; return 0;
} }
static void orion_clkevt_mode(enum clock_event_mode mode, static int orion_clkevt_shutdown(struct clock_event_device *dev)
struct clock_event_device *dev)
{ {
if (mode == CLOCK_EVT_MODE_PERIODIC) { /* disable timer */
/* setup and enable periodic timer at 1/HZ intervals */ atomic_io_modify(timer_base + TIMER_CTRL,
writel(ticks_per_jiffy - 1, timer_base + TIMER1_RELOAD); TIMER1_RELOAD_EN | TIMER1_EN, 0);
writel(ticks_per_jiffy - 1, timer_base + TIMER1_VAL); return 0;
atomic_io_modify(timer_base + TIMER_CTRL, }
TIMER1_RELOAD_EN | TIMER1_EN,
TIMER1_RELOAD_EN | TIMER1_EN); static int orion_clkevt_set_periodic(struct clock_event_device *dev)
} else { {
/* disable timer */ /* setup and enable periodic timer at 1/HZ intervals */
atomic_io_modify(timer_base + TIMER_CTRL, writel(ticks_per_jiffy - 1, timer_base + TIMER1_RELOAD);
TIMER1_RELOAD_EN | TIMER1_EN, 0); writel(ticks_per_jiffy - 1, timer_base + TIMER1_VAL);
} atomic_io_modify(timer_base + TIMER_CTRL,
TIMER1_RELOAD_EN | TIMER1_EN,
TIMER1_RELOAD_EN | TIMER1_EN);
return 0;
} }
static struct clock_event_device orion_clkevt = { static struct clock_event_device orion_clkevt = {
.name = "orion_event", .name = "orion_event",
.features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC, .features = CLOCK_EVT_FEAT_ONESHOT |
.shift = 32, CLOCK_EVT_FEAT_PERIODIC,
.rating = 300, .shift = 32,
.set_next_event = orion_clkevt_next_event, .rating = 300,
.set_mode = orion_clkevt_mode, .set_next_event = orion_clkevt_next_event,
.set_state_shutdown = orion_clkevt_shutdown,
.set_state_periodic = orion_clkevt_set_periodic,
.set_state_oneshot = orion_clkevt_shutdown,
.tick_resume = orion_clkevt_shutdown,
}; };
static irqreturn_t orion_clkevt_irq_handler(int irq, void *dev_id) static irqreturn_t orion_clkevt_irq_handler(int irq, void *dev_id)