Commit 397d08b0 authored by Viresh Kumar's avatar Viresh Kumar Committed by Ralf Baechle

MIPS: sni: Migrate to new 'set-state' interface

Migrate sni 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.
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linaro-kernel@lists.linaro.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Patchwork: https://patchwork.linux-mips.org/patch/10612/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0c16240a
...@@ -14,44 +14,33 @@ ...@@ -14,44 +14,33 @@
#define SNI_COUNTER2_DIV 64 #define SNI_COUNTER2_DIV 64
#define SNI_COUNTER0_DIV ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ) #define SNI_COUNTER0_DIV ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
static void a20r_set_mode(enum clock_event_mode mode, static int a20r_set_periodic(struct clock_event_device *evt)
struct clock_event_device *evt)
{ {
switch (mode) { *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34;
case CLOCK_EVT_MODE_PERIODIC: wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34; *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV;
wmb(); wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV; *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV >> 8;
wmb(); wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV >> 8;
wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4;
wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV;
wmb();
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV >> 8;
wmb();
break; *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4;
case CLOCK_EVT_MODE_ONESHOT: wmb();
case CLOCK_EVT_MODE_UNUSED: *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV;
case CLOCK_EVT_MODE_SHUTDOWN: wmb();
break; *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV >> 8;
case CLOCK_EVT_MODE_RESUME: wmb();
break; return 0;
}
} }
static struct clock_event_device a20r_clockevent_device = { static struct clock_event_device a20r_clockevent_device = {
.name = "a20r-timer", .name = "a20r-timer",
.features = CLOCK_EVT_FEAT_PERIODIC, .features = CLOCK_EVT_FEAT_PERIODIC,
/* .mult, .shift, .max_delta_ns and .min_delta_ns left uninitialized */ /* .mult, .shift, .max_delta_ns and .min_delta_ns left uninitialized */
.rating = 300, .rating = 300,
.irq = SNI_A20R_IRQ_TIMER, .irq = SNI_A20R_IRQ_TIMER,
.set_mode = a20r_set_mode, .set_state_periodic = a20r_set_periodic,
}; };
static irqreturn_t a20r_interrupt(int irq, void *dev_id) static irqreturn_t a20r_interrupt(int irq, void *dev_id)
......
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