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

Commit 40117bd5 authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

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



Migrate meson6 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: Carlo Caione <carlo@caione.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarCarlo Caione <carlo@caione.org>
parent 8eda41b0

drivers/clocksource/meson6_timer.c

+27 −23
Original line number Diff line number Diff line
@@ -67,25 +67,25 @@ static void meson6_clkevt_time_start(unsigned char timer, bool periodic) 
	writel(val | TIMER_ENABLE_BIT(timer), timer_base + TIMER_ISA_MUX);

}



static void meson6_clkevt_mode(enum clock_event_mode mode,

			       struct clock_event_device *clk)

static int meson6_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

	meson6_clkevt_time_stop(CED_ID);

		meson6_clkevt_time_setup(CED_ID, USEC_PER_SEC/HZ - 1);

		meson6_clkevt_time_start(CED_ID, true);

		break;

	case CLOCK_EVT_MODE_ONESHOT:

	return 0;

}



static int meson6_set_oneshot(struct clock_event_device *evt)

{

	meson6_clkevt_time_stop(CED_ID);

	meson6_clkevt_time_start(CED_ID, false);

		break;

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	default:

		meson6_clkevt_time_stop(CED_ID);

		break;

	return 0;

}



static int meson6_set_periodic(struct clock_event_device *evt)

{

	meson6_clkevt_time_stop(CED_ID);

	meson6_clkevt_time_setup(CED_ID, USEC_PER_SEC / HZ - 1);

	meson6_clkevt_time_start(CED_ID, true);

	return 0;

}



static int meson6_clkevt_next_event(unsigned long evt,
@@ -101,8 +101,12 @@ static int meson6_clkevt_next_event(unsigned long evt, 
static struct clock_event_device meson6_clockevent = {

	.name			= "meson6_tick",

	.rating			= 400,

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.set_mode	= meson6_clkevt_mode,

	.features		= CLOCK_EVT_FEAT_PERIODIC |

				  CLOCK_EVT_FEAT_ONESHOT,

	.set_state_shutdown	= meson6_shutdown,

	.set_state_periodic	= meson6_set_periodic,

	.set_state_oneshot	= meson6_set_oneshot,

	.tick_resume		= meson6_shutdown,

	.set_next_event		= meson6_clkevt_next_event,

};