Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 549a14c1 authored by Viresh Kumar's avatar Viresh Kumar Committed by Ley Foon Tan
Browse files

nios2/time: Migrate to new 'set-state' interface 



Migrate nios2 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: Ley Foon Tan <lftan@altera.com>
Cc: Tobias Klauser <tklauser@distanz.ch>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Dmitry Torokhov <dtor@chromium.org>
Cc: nios2-dev@lists.rocketboards.org
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarLey Foon Tan <lftan@altera.com>
parent 64291f7d

arch/nios2/kernel/time.c

+29 −20
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ static void nios2_timer_stop(struct nios2_timer *timer) 
}

}





static void nios2_timer_config(struct nios2_timer *timer, unsigned long period,

static void nios2_timer_config(struct nios2_timer *timer, unsigned long period,

	enum clock_event_mode mode)

			       bool periodic)

{

{

	u16 ctrl;

	u16 ctrl;
@@ -148,7 +148,7 @@ static void nios2_timer_config(struct nios2_timer *timer, unsigned long period, 
	timer_writew(timer, period >> 16, ALTERA_TIMER_PERIODH_REG);

	timer_writew(timer, period >> 16, ALTERA_TIMER_PERIODH_REG);





	ctrl |= ALTERA_TIMER_CONTROL_START_MSK | ALTERA_TIMER_CONTROL_ITO_MSK;

	ctrl |= ALTERA_TIMER_CONTROL_START_MSK | ALTERA_TIMER_CONTROL_ITO_MSK;

	if (mode == CLOCK_EVT_MODE_PERIODIC)

	if (periodic)

		ctrl |= ALTERA_TIMER_CONTROL_CONT_MSK;

		ctrl |= ALTERA_TIMER_CONTROL_CONT_MSK;

	else

	else

		ctrl &= ~ALTERA_TIMER_CONTROL_CONT_MSK;

		ctrl &= ~ALTERA_TIMER_CONTROL_CONT_MSK;
@@ -160,32 +160,38 @@ static int nios2_timer_set_next_event(unsigned long delta, 
{

{

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);





	nios2_timer_config(&nios2_ced->timer, delta, evt->mode);

	nios2_timer_config(&nios2_ced->timer, delta, false);





	return 0;

	return 0;

}

}





static void nios2_timer_set_mode(enum clock_event_mode mode,

static int nios2_timer_shutdown(struct clock_event_device *evt)

	struct clock_event_device *evt)

{

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);

	struct nios2_timer *timer = &nios2_ced->timer;



	nios2_timer_stop(timer);

	return 0;

}



static int nios2_timer_set_periodic(struct clock_event_device *evt)

{

{

	unsigned long period;

	unsigned long period;

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);

	struct nios2_timer *timer = &nios2_ced->timer;

	struct nios2_timer *timer = &nios2_ced->timer;





	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

	period = DIV_ROUND_UP(timer->freq, HZ);

	period = DIV_ROUND_UP(timer->freq, HZ);

		nios2_timer_config(timer, period, CLOCK_EVT_MODE_PERIODIC);

	nios2_timer_config(timer, period, true);

		break;

	return 0;

	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

		nios2_timer_stop(timer);

		break;

	case CLOCK_EVT_MODE_RESUME:

		nios2_timer_start(timer);

		break;

}

}



static int nios2_timer_resume(struct clock_event_device *evt)

{

	struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);

	struct nios2_timer *timer = &nios2_ced->timer;



	nios2_timer_start(timer);

	return 0;

}

}





irqreturn_t timer_interrupt(int irq, void *dev_id)

irqreturn_t timer_interrupt(int irq, void *dev_id)
@@ -218,7 +224,10 @@ static struct nios2_clockevent_dev nios2_ce = { 
		.rating = 250,

		.rating = 250,

		.shift = 32,

		.shift = 32,

		.set_next_event = nios2_timer_set_next_event,

		.set_next_event = nios2_timer_set_next_event,

		.set_mode = nios2_timer_set_mode,

		.set_state_shutdown = nios2_timer_shutdown,

		.set_state_periodic = nios2_timer_set_periodic,

		.set_state_oneshot = nios2_timer_shutdown,

		.tick_resume = nios2_timer_resume,

	},

	},

};

};