clockevents/drivers/u300: Migrate to new 'set-state' interface
Migrate u300 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: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Viresh Kumar
Daniel Lezcano
parent
7486f5ad27
commit
8ff8fc13bd
1 changed files with 77 additions and 78 deletions
|
|
@ -187,85 +187,82 @@ struct u300_clockevent_data {
|
||||||
unsigned ticks_per_jiffy;
|
unsigned ticks_per_jiffy;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int u300_shutdown(struct clock_event_device *evt)
|
||||||
|
{
|
||||||
|
/* Disable interrupts on GP1 */
|
||||||
|
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
||||||
|
/* Disable GP1 */
|
||||||
|
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_DGPT1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The u300_set_mode() function is always called first, if we
|
* If we have oneshot timer active, the oneshot scheduling function
|
||||||
* have oneshot timer active, the oneshot scheduling function
|
|
||||||
* u300_set_next_event() is called immediately after.
|
* u300_set_next_event() is called immediately after.
|
||||||
*/
|
*/
|
||||||
static void u300_set_mode(enum clock_event_mode mode,
|
static int u300_set_oneshot(struct clock_event_device *evt)
|
||||||
struct clock_event_device *evt)
|
{
|
||||||
|
/* Just return; here? */
|
||||||
|
/*
|
||||||
|
* The actual event will be programmed by the next event hook,
|
||||||
|
* so we just set a dummy value somewhere at the end of the
|
||||||
|
* universe here.
|
||||||
|
*/
|
||||||
|
/* Disable interrupts on GPT1 */
|
||||||
|
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
||||||
|
/* Disable GP1 while we're reprogramming it. */
|
||||||
|
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_DGPT1);
|
||||||
|
/*
|
||||||
|
* Expire far in the future, u300_set_next_event() will be
|
||||||
|
* called soon...
|
||||||
|
*/
|
||||||
|
writel(0xFFFFFFFF, u300_timer_base + U300_TIMER_APP_GPT1TC);
|
||||||
|
/* We run one shot per tick here! */
|
||||||
|
writel(U300_TIMER_APP_SGPT1M_MODE_ONE_SHOT,
|
||||||
|
u300_timer_base + U300_TIMER_APP_SGPT1M);
|
||||||
|
/* Enable interrupts for this timer */
|
||||||
|
writel(U300_TIMER_APP_GPT1IE_IRQ_ENABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
||||||
|
/* Enable timer */
|
||||||
|
writel(U300_TIMER_APP_EGPT1_TIMER_ENABLE,
|
||||||
|
u300_timer_base + U300_TIMER_APP_EGPT1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int u300_set_periodic(struct clock_event_device *evt)
|
||||||
{
|
{
|
||||||
struct u300_clockevent_data *cevdata =
|
struct u300_clockevent_data *cevdata =
|
||||||
container_of(evt, struct u300_clockevent_data, cevd);
|
container_of(evt, struct u300_clockevent_data, cevd);
|
||||||
|
|
||||||
switch (mode) {
|
/* Disable interrupts on GPT1 */
|
||||||
case CLOCK_EVT_MODE_PERIODIC:
|
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
||||||
/* Disable interrupts on GPT1 */
|
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
||||||
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
/* Disable GP1 while we're reprogramming it. */
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
||||||
/* Disable GP1 while we're reprogramming it. */
|
u300_timer_base + U300_TIMER_APP_DGPT1);
|
||||||
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
/*
|
||||||
u300_timer_base + U300_TIMER_APP_DGPT1);
|
* Set the periodic mode to a certain number of ticks per
|
||||||
/*
|
* jiffy.
|
||||||
* Set the periodic mode to a certain number of ticks per
|
*/
|
||||||
* jiffy.
|
writel(cevdata->ticks_per_jiffy,
|
||||||
*/
|
u300_timer_base + U300_TIMER_APP_GPT1TC);
|
||||||
writel(cevdata->ticks_per_jiffy,
|
/*
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1TC);
|
* Set continuous mode, so the timer keeps triggering
|
||||||
/*
|
* interrupts.
|
||||||
* Set continuous mode, so the timer keeps triggering
|
*/
|
||||||
* interrupts.
|
writel(U300_TIMER_APP_SGPT1M_MODE_CONTINUOUS,
|
||||||
*/
|
u300_timer_base + U300_TIMER_APP_SGPT1M);
|
||||||
writel(U300_TIMER_APP_SGPT1M_MODE_CONTINUOUS,
|
/* Enable timer interrupts */
|
||||||
u300_timer_base + U300_TIMER_APP_SGPT1M);
|
writel(U300_TIMER_APP_GPT1IE_IRQ_ENABLE,
|
||||||
/* Enable timer interrupts */
|
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
||||||
writel(U300_TIMER_APP_GPT1IE_IRQ_ENABLE,
|
/* Then enable the OS timer again */
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
writel(U300_TIMER_APP_EGPT1_TIMER_ENABLE,
|
||||||
/* Then enable the OS timer again */
|
u300_timer_base + U300_TIMER_APP_EGPT1);
|
||||||
writel(U300_TIMER_APP_EGPT1_TIMER_ENABLE,
|
return 0;
|
||||||
u300_timer_base + U300_TIMER_APP_EGPT1);
|
|
||||||
break;
|
|
||||||
case CLOCK_EVT_MODE_ONESHOT:
|
|
||||||
/* Just break; here? */
|
|
||||||
/*
|
|
||||||
* The actual event will be programmed by the next event hook,
|
|
||||||
* so we just set a dummy value somewhere at the end of the
|
|
||||||
* universe here.
|
|
||||||
*/
|
|
||||||
/* Disable interrupts on GPT1 */
|
|
||||||
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
|
||||||
/* Disable GP1 while we're reprogramming it. */
|
|
||||||
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_DGPT1);
|
|
||||||
/*
|
|
||||||
* Expire far in the future, u300_set_next_event() will be
|
|
||||||
* called soon...
|
|
||||||
*/
|
|
||||||
writel(0xFFFFFFFF, u300_timer_base + U300_TIMER_APP_GPT1TC);
|
|
||||||
/* We run one shot per tick here! */
|
|
||||||
writel(U300_TIMER_APP_SGPT1M_MODE_ONE_SHOT,
|
|
||||||
u300_timer_base + U300_TIMER_APP_SGPT1M);
|
|
||||||
/* Enable interrupts for this timer */
|
|
||||||
writel(U300_TIMER_APP_GPT1IE_IRQ_ENABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
|
||||||
/* Enable timer */
|
|
||||||
writel(U300_TIMER_APP_EGPT1_TIMER_ENABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_EGPT1);
|
|
||||||
break;
|
|
||||||
case CLOCK_EVT_MODE_UNUSED:
|
|
||||||
case CLOCK_EVT_MODE_SHUTDOWN:
|
|
||||||
/* Disable interrupts on GP1 */
|
|
||||||
writel(U300_TIMER_APP_GPT1IE_IRQ_DISABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_GPT1IE);
|
|
||||||
/* Disable GP1 */
|
|
||||||
writel(U300_TIMER_APP_DGPT1_TIMER_DISABLE,
|
|
||||||
u300_timer_base + U300_TIMER_APP_DGPT1);
|
|
||||||
break;
|
|
||||||
case CLOCK_EVT_MODE_RESUME:
|
|
||||||
/* Ignore this call */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -309,13 +306,15 @@ static int u300_set_next_event(unsigned long cycles,
|
||||||
static struct u300_clockevent_data u300_clockevent_data = {
|
static struct u300_clockevent_data u300_clockevent_data = {
|
||||||
/* Use general purpose timer 1 as clock event */
|
/* Use general purpose timer 1 as clock event */
|
||||||
.cevd = {
|
.cevd = {
|
||||||
.name = "GPT1",
|
.name = "GPT1",
|
||||||
/* Reasonably fast and accurate clock event */
|
/* Reasonably fast and accurate clock event */
|
||||||
.rating = 300,
|
.rating = 300,
|
||||||
.features = CLOCK_EVT_FEAT_PERIODIC |
|
.features = CLOCK_EVT_FEAT_PERIODIC |
|
||||||
CLOCK_EVT_FEAT_ONESHOT,
|
CLOCK_EVT_FEAT_ONESHOT,
|
||||||
.set_next_event = u300_set_next_event,
|
.set_next_event = u300_set_next_event,
|
||||||
.set_mode = u300_set_mode,
|
.set_state_shutdown = u300_shutdown,
|
||||||
|
.set_state_periodic = u300_set_periodic,
|
||||||
|
.set_state_oneshot = u300_set_oneshot,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue