nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
Migrate mxs 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.

Also drop:
- 'mxs_clockevent_mode': as we have helpers available from core for the
  same.
  same state twice and so perhaps the check wasn't required.
- 'clock_event_mode_label': CLOCK_EVT_MODE_* shouldn't be used anymore
  by drivers and it was used just to print old-state:new-state. The
  debug prints are called from mxs_irq_clear() now based on the
  state-name passed to it. The printed name will be same for shutdown
  and resume states as they use the same callback pointer.

Cc: Shawn Guo <shawn.guo@linaro.org>
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:28 +05:30 committed by Daniel Lezcano
parent a2b7e10d29
commit eb8703e2ef
1 changed files with 30 additions and 46 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

76
drivers/clocksource/mxs_timer.c
View file

@ -77,7 +77,6 @@
#define BV_TIMROTv2_TIMCTRLn_SELECT__TICK_ALWAYS 0xf #define BV_TIMROTv2_TIMCTRLn_SELECT__TICK_ALWAYS 0xf
static struct clock_event_device mxs_clockevent_device; static struct clock_event_device mxs_clockevent_device;
static enum clock_event_mode mxs_clockevent_mode = CLOCK_EVT_MODE_UNUSED;
static void __iomem *mxs_timrot_base; static void __iomem *mxs_timrot_base;
static u32 timrot_major_version; static u32 timrot_major_version;
@ -141,64 +140,49 @@ static struct irqaction mxs_timer_irq = {
.handler = mxs_timer_interrupt, .handler = mxs_timer_interrupt,
}; };
#ifdef DEBUG static void mxs_irq_clear(char *state)
static const char *clock_event_mode_label[] const = {
[CLOCK_EVT_MODE_PERIODIC] = "CLOCK_EVT_MODE_PERIODIC",
[CLOCK_EVT_MODE_ONESHOT] = "CLOCK_EVT_MODE_ONESHOT",
[CLOCK_EVT_MODE_SHUTDOWN] = "CLOCK_EVT_MODE_SHUTDOWN",
[CLOCK_EVT_MODE_UNUSED] = "CLOCK_EVT_MODE_UNUSED"
};
#endif /* DEBUG */
static void mxs_set_mode(enum clock_event_mode mode,
struct clock_event_device *evt)
{ {
/* Disable interrupt in timer module */ /* Disable interrupt in timer module */
timrot_irq_disable(); timrot_irq_disable();
if (mode != mxs_clockevent_mode) { /* Set event time into the furthest future */
/* Set event time into the furthest future */ if (timrot_is_v1())
if (timrot_is_v1()) __raw_writel(0xffff, mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1));
__raw_writel(0xffff, else
mxs_timrot_base + HW_TIMROT_TIMCOUNTn(1)); __raw_writel(0xffffffff,
else mxs_timrot_base + HW_TIMROT_FIXED_COUNTn(1));
__raw_writel(0xffffffff,
mxs_timrot_base + HW_TIMROT_FIXED_COUNTn(1));
/* Clear pending interrupt */ /* Clear pending interrupt */
timrot_irq_acknowledge(); timrot_irq_acknowledge();
}
#ifdef DEBUG #ifdef DEBUG
pr_info("%s: changing mode from %s to %s\n", __func__, pr_info("%s: changing mode to %s\n", __func__, state)
clock_event_mode_label[mxs_clockevent_mode],
clock_event_mode_label[mode]);
#endif /* DEBUG */ #endif /* DEBUG */
}
/* Remember timer mode */ static int mxs_shutdown(struct clock_event_device *evt)
mxs_clockevent_mode = mode; {
mxs_irq_clear("shutdown");
switch (mode) { return 0;
case CLOCK_EVT_MODE_PERIODIC: }
pr_err("%s: Periodic mode is not implemented\n", __func__);
break; static int mxs_set_oneshot(struct clock_event_device *evt)
case CLOCK_EVT_MODE_ONESHOT: {
timrot_irq_enable(); if (clockevent_state_oneshot(evt))
break; mxs_irq_clear("oneshot");
case CLOCK_EVT_MODE_SHUTDOWN: timrot_irq_enable();
case CLOCK_EVT_MODE_UNUSED: return 0;
case CLOCK_EVT_MODE_RESUME:
/* Left event sources disabled, no more interrupts appear */
break;
}
} }
static struct clock_event_device mxs_clockevent_device = { static struct clock_event_device mxs_clockevent_device = {
.name = "mxs_timrot", .name = "mxs_timrot",
.features = CLOCK_EVT_FEAT_ONESHOT, .features = CLOCK_EVT_FEAT_ONESHOT,
.set_mode = mxs_set_mode, .set_state_shutdown = mxs_shutdown,
.set_next_event = timrotv2_set_next_event, .set_state_oneshot = mxs_set_oneshot,
.rating = 200, .tick_resume = mxs_shutdown,
.set_next_event = timrotv2_set_next_event,
.rating = 200,
}; };
static int __init mxs_clockevent_init(struct clk *timer_clk) static int __init mxs_clockevent_init(struct clk *timer_clk)