diff options
author | Ben Dooks <ben-linux@fluff.org> | 2006-03-20 12:10:03 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-21 17:06:01 -0500 |
commit | 766636cc3630ae3b9827e7b4b1f566572963f1ef (patch) | |
tree | 6405563d6daeff302e1501329a2917d83accfc36 /arch | |
parent | 110d322b29c08d8cf1dba599fd45ad2b9752a4bb (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/time.c | 8 |
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 = { | |||
142 | .handler = s3c2410_timer_interrupt, | 142 | .handler = s3c2410_timer_interrupt, |
143 | }; | 143 | }; |
144 | 144 | ||
145 | #define use_tclk1_12() ( \ | ||
146 | machine_is_bast() || \ | ||
147 | machine_is_vr1000() || \ | ||
148 | machine_is_anubis() || \ | ||
149 | machine_is_osiris() ) | ||
150 | |||
145 | /* | 151 | /* |
146 | * Set up timer interrupt, and return the current time in seconds. | 152 | * Set up timer interrupt, and return the current time in seconds. |
147 | * | 153 | * |
@@ -165,7 +171,7 @@ static void s3c2410_timer_setup (void) | |||
165 | 171 | ||
166 | /* configure the system for whichever machine is in use */ | 172 | /* configure the system for whichever machine is in use */ |
167 | 173 | ||
168 | if (machine_is_bast() || machine_is_vr1000() || machine_is_anubis()) { | 174 | if (use_tclk1_12()) { |
169 | /* timer is at 12MHz, scaler is 1 */ | 175 | /* timer is at 12MHz, scaler is 1 */ |
170 | timer_usec_ticks = timer_mask_usec_ticks(1, 12000000); | 176 | timer_usec_ticks = timer_mask_usec_ticks(1, 12000000); |
171 | tcnt = 12000000 / HZ; | 177 | tcnt = 12000000 / HZ; |