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

Commit 49356ae9 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: at91: convert timer suspend/resume to clock_event_device 



Move at91's timer suspend/resume functions from struct sys_timer
at91sam926x_timer into struct clock_event_device pit_clkevt. This
will allow the sys_timer suspend/resume fields to be removed, and
eventually lead to a complete removal of struct sys_timer.

Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 23c197b7

arch/arm/mach-at91/at91sam926x_time.c

+26 −21
Original line number Diff line number Diff line
@@ -104,12 +104,38 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) 
	}

}



static void at91sam926x_pit_suspend(struct clock_event_device *cedev)

{

	/* Disable timer */

	pit_write(AT91_PIT_MR, 0);

}



static void at91sam926x_pit_reset(void)

{

	/* Disable timer and irqs */

	pit_write(AT91_PIT_MR, 0);



	/* Clear any pending interrupts, wait for PIT to stop counting */

	while (PIT_CPIV(pit_read(AT91_PIT_PIVR)) != 0)

		cpu_relax();



	/* Start PIT but don't enable IRQ */

	pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);

}



static void at91sam926x_pit_resume(struct clock_event_device *cedev)

{

	at91sam926x_pit_reset();

}



static struct clock_event_device pit_clkevt = {

	.name		= "pit",

	.features	= CLOCK_EVT_FEAT_PERIODIC,

	.shift		= 32,

	.rating		= 100,

	.set_mode	= pit_clkevt_mode,

	.suspend	= at91sam926x_pit_suspend,

	.resume		= at91sam926x_pit_resume,

};
@@ -150,19 +176,6 @@ static struct irqaction at91sam926x_pit_irq = { 
	.irq		= NR_IRQS_LEGACY + AT91_ID_SYS,

};



static void at91sam926x_pit_reset(void)

{

	/* Disable timer and irqs */

	pit_write(AT91_PIT_MR, 0);



	/* Clear any pending interrupts, wait for PIT to stop counting */

	while (PIT_CPIV(pit_read(AT91_PIT_PIVR)) != 0)

		cpu_relax();



	/* Start PIT but don't enable IRQ */

	pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);

}



#ifdef CONFIG_OF

static struct of_device_id pit_timer_ids[] = {

	{ .compatible = "atmel,at91sam9260-pit" },
@@ -250,12 +263,6 @@ static void __init at91sam926x_pit_init(void) 
	clockevents_register_device(&pit_clkevt);

}



static void at91sam926x_pit_suspend(void)

{

	/* Disable timer */

	pit_write(AT91_PIT_MR, 0);

}



void __init at91sam926x_ioremap_pit(u32 addr)

{

#if defined(CONFIG_OF)
@@ -275,6 +282,4 @@ void __init at91sam926x_ioremap_pit(u32 addr) 


struct sys_timer at91sam926x_timer = {

	.init		= at91sam926x_pit_init,

	.suspend	= at91sam926x_pit_suspend,

	.resume		= at91sam926x_pit_reset,

};