diff options
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
-rw-r--r-- | arch/arm/mach-pxa/time.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index bf3c9a4aad50..95656a72268d 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -22,8 +22,8 @@ | |||
22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
23 | #include <asm/mach/irq.h> | 23 | #include <asm/mach/irq.h> |
24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
25 | #include <mach/hardware.h> | ||
25 | #include <mach/pxa-regs.h> | 26 | #include <mach/pxa-regs.h> |
26 | #include <asm/mach-types.h> | ||
27 | 27 | ||
28 | /* | 28 | /* |
29 | * This is PXA's sched_clock implementation. This has a resolution | 29 | * This is PXA's sched_clock implementation. This has a resolution |
@@ -149,18 +149,11 @@ static struct irqaction pxa_ost0_irq = { | |||
149 | 149 | ||
150 | static void __init pxa_timer_init(void) | 150 | static void __init pxa_timer_init(void) |
151 | { | 151 | { |
152 | unsigned long clock_tick_rate; | 152 | unsigned long clock_tick_rate = get_clock_tick_rate(); |
153 | 153 | ||
154 | OIER = 0; | 154 | OIER = 0; |
155 | OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3; | 155 | OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3; |
156 | 156 | ||
157 | if (cpu_is_pxa25x()) | ||
158 | clock_tick_rate = 3686400; | ||
159 | else if (machine_is_mainstone()) | ||
160 | clock_tick_rate = 3249600; | ||
161 | else | ||
162 | clock_tick_rate = 3250000; | ||
163 | |||
164 | set_oscr2ns_scale(clock_tick_rate); | 157 | set_oscr2ns_scale(clock_tick_rate); |
165 | 158 | ||
166 | ckevt_pxa_osmr0.mult = | 159 | ckevt_pxa_osmr0.mult = |