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

Commit 9797529d authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

microblaze/timer: Migrate to new 'set-state' interface 



Migrate microblaze 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 or ONESHOT) and so
tick_resume() set_state_oneshot() aren't implemented.

Cc: Michal Simek <monstr@monstr.eu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 677e6fe0

arch/microblaze/kernel/timer.c

+19 −27
Original line number Diff line number Diff line
@@ -122,37 +122,29 @@ static int xilinx_timer_set_next_event(unsigned long delta, 
	return 0;

}



static void xilinx_timer_set_mode(enum clock_event_mode mode,

				struct clock_event_device *evt)

static int xilinx_timer_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

		pr_info("%s: periodic\n", __func__);

		xilinx_timer0_start_periodic(freq_div_hz);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

		pr_info("%s: oneshot\n", __func__);

		break;

	case CLOCK_EVT_MODE_UNUSED:

		pr_info("%s: unused\n", __func__);

		break;

	case CLOCK_EVT_MODE_SHUTDOWN:

		pr_info("%s: shutdown\n", __func__);

	pr_info("%s\n", __func__);

	xilinx_timer0_stop();

		break;

	case CLOCK_EVT_MODE_RESUME:

		pr_info("%s: resume\n", __func__);

		break;

	return 0;

}



static int xilinx_timer_set_periodic(struct clock_event_device *evt)

{

	pr_info("%s\n", __func__);

	xilinx_timer0_start_periodic(freq_div_hz);

	return 0;

}



static struct clock_event_device clockevent_xilinx_timer = {

	.name			= "xilinx_clockevent",

	.features       = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,

	.features		= CLOCK_EVT_FEAT_ONESHOT |

				  CLOCK_EVT_FEAT_PERIODIC,

	.shift			= 8,

	.rating			= 300,

	.set_next_event		= xilinx_timer_set_next_event,

	.set_mode	= xilinx_timer_set_mode,

	.set_state_shutdown	= xilinx_timer_shutdown,

	.set_state_periodic	= xilinx_timer_set_periodic,

};



static inline void timer_ack(void)