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

Commit 3078c8df authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

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



Migrate unicore 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 for PERIODIC or RESUME modes and so their
callbacks aren't implemented.

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 71b5280b

arch/unicore32/kernel/time.c

+10 −19
Original line number Diff line number Diff line
@@ -46,21 +46,11 @@ puv3_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c) 
	return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;

}



static void

puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)

static int puv3_osmr0_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	writel(readl(OST_OIER) & ~OST_OIER_E0, OST_OIER);

	writel(readl(OST_OSSR) & ~OST_OSSR_M0, OST_OSSR);

		break;



	case CLOCK_EVT_MODE_RESUME:

	case CLOCK_EVT_MODE_PERIODIC:

		break;

	}

	return 0;

}



static struct clock_event_device ckevt_puv3_osmr0 = {
@@ -68,7 +58,8 @@ static struct clock_event_device ckevt_puv3_osmr0 = { 
	.features		= CLOCK_EVT_FEAT_ONESHOT,

	.rating			= 200,

	.set_next_event		= puv3_osmr0_set_next_event,

	.set_mode	= puv3_osmr0_set_mode,

	.set_state_shutdown	= puv3_osmr0_shutdown,

	.set_state_oneshot	= puv3_osmr0_shutdown,

};



static cycle_t puv3_read_oscr(struct clocksource *cs)