Commit bc660a45 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

ARM/davinci/time: Migrate to new 'set-state' interface 



Migrate davinci 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.

We weren't doing anything in set_mode(RESUME) and so .tick_resume()
isn't implemented.

Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 9bdc2e0c

arch/arm/mach-davinci/time.c

+30 −24
Original line number Diff line number Diff line
@@ -303,36 +303,42 @@ static int davinci_set_next_event(unsigned long cycles, 
	return 0;

}



static void davinci_set_mode(enum clock_event_mode mode,

			     struct clock_event_device *evt)

static int davinci_shutdown(struct clock_event_device *evt)

{

	struct timer_s *t = &timers[TID_CLOCKEVENT];



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

		t->period = davinci_clock_tick_rate / (HZ);

	t->opts &= ~TIMER_OPTS_STATE_MASK;

		t->opts |= TIMER_OPTS_PERIODIC;

		timer32_config(t);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

	t->opts |= TIMER_OPTS_DISABLED;

	return 0;

}



static int davinci_set_oneshot(struct clock_event_device *evt)

{

	struct timer_s *t = &timers[TID_CLOCKEVENT];



	t->opts &= ~TIMER_OPTS_STATE_MASK;

	t->opts |= TIMER_OPTS_ONESHOT;

		break;

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

		t->opts &= ~TIMER_OPTS_STATE_MASK;

		t->opts |= TIMER_OPTS_DISABLED;

		break;

	case CLOCK_EVT_MODE_RESUME:

		break;

	return 0;

}



static int davinci_set_periodic(struct clock_event_device *evt)

{

	struct timer_s *t = &timers[TID_CLOCKEVENT];



	t->period = davinci_clock_tick_rate / (HZ);

	t->opts &= ~TIMER_OPTS_STATE_MASK;

	t->opts |= TIMER_OPTS_PERIODIC;

	timer32_config(t);

	return 0;

}



static struct clock_event_device clockevent_davinci = {

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features		= CLOCK_EVT_FEAT_PERIODIC |

				  CLOCK_EVT_FEAT_ONESHOT,

	.set_next_event		= davinci_set_next_event,

	.set_mode	= davinci_set_mode,

	.set_state_shutdown	= davinci_shutdown,

	.set_state_periodic	= davinci_set_periodic,

	.set_state_oneshot	= davinci_set_oneshot,

};