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

Commit 47d490ea authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

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



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

Both oneshot and shutdown modes had exactly same code and so only a
single callback is sufficient now, which will be called for both the
modes.

Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
parent 9b0af699

drivers/clocksource/pxa_timer.c

+13 −26
Original line number Diff line number Diff line
@@ -88,26 +88,12 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev) 
	return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;

}



static void

pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)

static int pxa_osmr0_shutdown(struct clock_event_device *evt)

{

	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

		timer_writel(timer_readl(OIER) & ~OIER_E0, OIER);

		timer_writel(OSSR_M0, OSSR);

		break;



	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	/* initializing, released, or preparing for suspend */

	timer_writel(timer_readl(OIER) & ~OIER_E0, OIER);

	timer_writel(OSSR_M0, OSSR);

		break;



	case CLOCK_EVT_MODE_RESUME:

	case CLOCK_EVT_MODE_PERIODIC:

		break;

	}

	return 0;

}



#ifdef CONFIG_PM
@@ -151,7 +137,8 @@ static struct clock_event_device ckevt_pxa_osmr0 = { 
	.features		= CLOCK_EVT_FEAT_ONESHOT,

	.rating			= 200,

	.set_next_event		= pxa_osmr0_set_next_event,

	.set_mode	= pxa_osmr0_set_mode,

	.set_state_shutdown	= pxa_osmr0_shutdown,

	.set_state_oneshot	= pxa_osmr0_shutdown,

	.suspend		= pxa_timer_suspend,

	.resume			= pxa_timer_resume,

};