Commit c88f2fb4 authored by Viresh Kumar's avatar Viresh Kumar Committed by Ralf Baechle
Browse files

MIPS: cevt-gt641xx: Migrate to new 'set-state' interface 



Migrate cevt-gt641xx 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.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linaro-kernel@lists.linaro.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Patchwork: https://patchwork.linux-mips.org/patch/10604/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9f95618f

arch/mips/kernel/cevt-gt641xx.c

+39 −18
Original line number Original line Diff line number Diff line
@@ -64,8 +64,7 @@ static int gt641xx_timer0_set_next_event(unsigned long delta, 
	return 0;

	return 0;

}

}





static void gt641xx_timer0_set_mode(enum clock_event_mode mode,

static int gt641xx_timer0_shutdown(struct clock_event_device *evt)

				    struct clock_event_device *evt)

{

{

	u32 ctrl;

	u32 ctrl;
@@ -73,21 +72,39 @@ static void gt641xx_timer0_set_mode(enum clock_event_mode mode, 




	ctrl = GT_READ(GT_TC_CONTROL_OFS);

	ctrl = GT_READ(GT_TC_CONTROL_OFS);

	ctrl &= ~(GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);

	ctrl &= ~(GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);

	GT_WRITE(GT_TC_CONTROL_OFS, ctrl);





	switch (mode) {

	raw_spin_unlock(&gt641xx_timer_lock);

	case CLOCK_EVT_MODE_PERIODIC:

	return 0;

		ctrl |= GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK;

}

		break;



	case CLOCK_EVT_MODE_ONESHOT:

static int gt641xx_timer0_set_oneshot(struct clock_event_device *evt)

{

	u32 ctrl;



	raw_spin_lock(&gt641xx_timer_lock);



	ctrl = GT_READ(GT_TC_CONTROL_OFS);

	ctrl &= ~GT_TC_CONTROL_SELTC0_MSK;

	ctrl |= GT_TC_CONTROL_ENTC0_MSK;

	ctrl |= GT_TC_CONTROL_ENTC0_MSK;

		break;

	GT_WRITE(GT_TC_CONTROL_OFS, ctrl);

	default:



		break;

	raw_spin_unlock(&gt641xx_timer_lock);

	return 0;

}

}





static int gt641xx_timer0_set_periodic(struct clock_event_device *evt)

{

	u32 ctrl;



	raw_spin_lock(&gt641xx_timer_lock);



	ctrl = GT_READ(GT_TC_CONTROL_OFS);

	ctrl |= GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK;

	GT_WRITE(GT_TC_CONTROL_OFS, ctrl);

	GT_WRITE(GT_TC_CONTROL_OFS, ctrl);





	raw_spin_unlock(&gt641xx_timer_lock);

	raw_spin_unlock(&gt641xx_timer_lock);

	return 0;

}

}





static void gt641xx_timer0_event_handler(struct clock_event_device *dev)

static void gt641xx_timer0_event_handler(struct clock_event_device *dev)
@@ -96,10 +113,14 @@ static void gt641xx_timer0_event_handler(struct clock_event_device *dev) 




static struct clock_event_device gt641xx_timer0_clockevent = {

static struct clock_event_device gt641xx_timer0_clockevent = {

	.name			= "gt641xx-timer0",

	.name			= "gt641xx-timer0",

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features		= CLOCK_EVT_FEAT_PERIODIC |

				  CLOCK_EVT_FEAT_ONESHOT,

	.irq			= GT641XX_TIMER0_IRQ,

	.irq			= GT641XX_TIMER0_IRQ,

	.set_next_event		= gt641xx_timer0_set_next_event,

	.set_next_event		= gt641xx_timer0_set_next_event,

	.set_mode	= gt641xx_timer0_set_mode,

	.set_state_shutdown	= gt641xx_timer0_shutdown,

	.set_state_periodic	= gt641xx_timer0_set_periodic,

	.set_state_oneshot	= gt641xx_timer0_set_oneshot,

	.tick_resume		= gt641xx_timer0_shutdown,

	.event_handler		= gt641xx_timer0_event_handler,

	.event_handler		= gt641xx_timer0_event_handler,

};

};