diff options
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
-rw-r--r-- | arch/arm/mach-msm/timer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 950100f19d07..595be7fea31a 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
@@ -137,7 +137,6 @@ static struct msm_clock msm_clocks[] = { | |||
137 | .rating = 200, | 137 | .rating = 200, |
138 | .read = msm_gpt_read, | 138 | .read = msm_gpt_read, |
139 | .mask = CLOCKSOURCE_MASK(32), | 139 | .mask = CLOCKSOURCE_MASK(32), |
140 | .shift = 17, | ||
141 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 140 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
142 | }, | 141 | }, |
143 | .irq = { | 142 | .irq = { |
@@ -164,7 +163,6 @@ static struct msm_clock msm_clocks[] = { | |||
164 | .rating = 300, | 163 | .rating = 300, |
165 | .read = msm_dgt_read, | 164 | .read = msm_dgt_read, |
166 | .mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)), | 165 | .mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)), |
167 | .shift = 24 - MSM_DGT_SHIFT, | ||
168 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 166 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
169 | }, | 167 | }, |
170 | .irq = { | 168 | .irq = { |
@@ -205,8 +203,7 @@ static void __init msm_timer_init(void) | |||
205 | ce->min_delta_ns = clockevent_delta2ns(4, ce); | 203 | ce->min_delta_ns = clockevent_delta2ns(4, ce); |
206 | ce->cpumask = cpumask_of(0); | 204 | ce->cpumask = cpumask_of(0); |
207 | 205 | ||
208 | cs->mult = clocksource_hz2mult(clock->freq, cs->shift); | 206 | res = clocksource_register_hz(cs, clock->freq); |
209 | res = clocksource_register(cs); | ||
210 | if (res) | 207 | if (res) |
211 | printk(KERN_ERR "msm_timer_init: clocksource_register " | 208 | printk(KERN_ERR "msm_timer_init: clocksource_register " |
212 | "failed for %s\n", cs->name); | 209 | "failed for %s\n", cs->name); |