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