Skip to content

Commit

Permalink
[ARM] 3329/1: S3C24XX - fix time for osiris machine
Browse files Browse the repository at this point in the history
Patch from Ben Dooks

Add selection for timer code for the Simtec Osiris

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Mar 21, 2006
1 parent 110d322 commit 766636c
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion arch/arm/mach-s3c2410/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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;
Expand Down

0 comments on commit 766636c

Please sign in to comment.