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

Commit 766636cc authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3329/1: S3C24XX - fix time for osiris machine 



Patch from Ben Dooks

Add selection for timer code for the Simtec Osiris

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 110d322b

arch/arm/mach-s3c2410/time.c

+7 −1
Original line number Diff line number Diff line
@@ -142,6 +142,12 @@ static struct irqaction s3c2410_timer_irq = { 
	.handler	= s3c2410_timer_interrupt,

};



#define use_tclk1_12() ( \

	machine_is_bast()	|| \

	machine_is_vr1000()	|| \

	machine_is_anubis()	|| \

	machine_is_osiris() )



/*

 * Set up timer interrupt, and return the current time in seconds.

 *
@@ -165,7 +171,7 @@ static void s3c2410_timer_setup (void) 


	/* configure the system for whichever machine is in use */



	if (machine_is_bast() || machine_is_vr1000() || machine_is_anubis()) {

	if (use_tclk1_12()) {

		/* timer is at 12MHz, scaler is 1 */

		timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);

		tcnt = 12000000 / HZ;