Commit 85250fb8 authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano

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

Migrate atmel 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: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 1e729d37
...@@ -90,33 +90,27 @@ static cycle_t read_pit_clk(struct clocksource *cs) ...@@ -90,33 +90,27 @@ static cycle_t read_pit_clk(struct clocksource *cs)
return elapsed; return elapsed;
} }
static int pit_clkevt_shutdown(struct clock_event_device *dev)
{
struct pit_data *data = clkevt_to_pit_data(dev);
/* disable irq, leaving the clocksource active */
pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
return 0;
}
/* /*
* Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16) * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16)
*/ */
static void static int pit_clkevt_set_periodic(struct clock_event_device *dev)
pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
{ {
struct pit_data *data = clkevt_to_pit_data(dev); struct pit_data *data = clkevt_to_pit_data(dev);
switch (mode) { /* update clocksource counter */
case CLOCK_EVT_MODE_PERIODIC: data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
/* update clocksource counter */ pit_write(data->base, AT91_PIT_MR,
data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR)); (data->cycle - 1) | AT91_PIT_PITEN | AT91_PIT_PITIEN);
pit_write(data->base, AT91_PIT_MR, return 0;
(data->cycle - 1) | AT91_PIT_PITEN | AT91_PIT_PITIEN);
break;
case CLOCK_EVT_MODE_ONESHOT:
BUG();
/* FALLTHROUGH */
case CLOCK_EVT_MODE_SHUTDOWN:
case CLOCK_EVT_MODE_UNUSED:
/* disable irq, leaving the clocksource active */
pit_write(data->base, AT91_PIT_MR,
(data->cycle - 1) | AT91_PIT_PITEN);
break;
case CLOCK_EVT_MODE_RESUME:
break;
}
} }
static void at91sam926x_pit_suspend(struct clock_event_device *cedev) static void at91sam926x_pit_suspend(struct clock_event_device *cedev)
...@@ -162,7 +156,7 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id) ...@@ -162,7 +156,7 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
WARN_ON_ONCE(!irqs_disabled()); WARN_ON_ONCE(!irqs_disabled());
/* The PIT interrupt may be disabled, and is shared */ /* The PIT interrupt may be disabled, and is shared */
if ((data->clkevt.mode == CLOCK_EVT_MODE_PERIODIC) && if (clockevent_state_periodic(&data->clkevt) &&
(pit_read(data->base, AT91_PIT_SR) & AT91_PIT_PITS)) { (pit_read(data->base, AT91_PIT_SR) & AT91_PIT_PITS)) {
unsigned nr_ticks; unsigned nr_ticks;
...@@ -227,7 +221,8 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data) ...@@ -227,7 +221,8 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data)
data->clkevt.rating = 100; data->clkevt.rating = 100;
data->clkevt.cpumask = cpumask_of(0); data->clkevt.cpumask = cpumask_of(0);
data->clkevt.set_mode = pit_clkevt_mode; data->clkevt.set_state_shutdown = pit_clkevt_shutdown;
data->clkevt.set_state_periodic = pit_clkevt_set_periodic;
data->clkevt.resume = at91sam926x_pit_resume; data->clkevt.resume = at91sam926x_pit_resume;
data->clkevt.suspend = at91sam926x_pit_suspend; data->clkevt.suspend = at91sam926x_pit_suspend;
clockevents_register_device(&data->clkevt); clockevents_register_device(&data->clkevt);
......
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