summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-03-20 17:10:03 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-21 22:06:01 +0000
commit766636cc3630ae3b9827e7b4b1f566572963f1ef (patch)
tree6405563d6daeff302e1501329a2917d83accfc36
parent110d322b29c08d8cf1dba599fd45ad2b9752a4bb (diff)
downloadlinux-766636cc3630ae3b9827e7b4b1f566572963f1ef.tar.bz2
[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: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-s3c2410/time.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 10a2976aefdd..9d7b799ea4a4 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -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;