diff options
-rw-r--r-- | arch/arm/plat-iop/time.c | 53 |
1 files changed, 9 insertions, 44 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c index 6c8a02ad98e3..85d3e55ca4a9 100644 --- a/arch/arm/plat-iop/time.c +++ b/arch/arm/plat-iop/time.c | |||
@@ -29,6 +29,11 @@ | |||
29 | #include <mach/time.h> | 29 | #include <mach/time.h> |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * Minimum clocksource/clockevent timer range in seconds | ||
33 | */ | ||
34 | #define IOP_MIN_RANGE 4 | ||
35 | |||
36 | /* | ||
32 | * IOP clocksource (free-running timer 1). | 37 | * IOP clocksource (free-running timer 1). |
33 | */ | 38 | */ |
34 | static cycle_t iop_clocksource_read(struct clocksource *unused) | 39 | static cycle_t iop_clocksource_read(struct clocksource *unused) |
@@ -44,27 +49,6 @@ static struct clocksource iop_clocksource = { | |||
44 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 49 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
45 | }; | 50 | }; |
46 | 51 | ||
47 | static void __init iop_clocksource_set_hz(struct clocksource *cs, unsigned int hz) | ||
48 | { | ||
49 | u64 temp; | ||
50 | u32 shift; | ||
51 | |||
52 | /* Find shift and mult values for hz. */ | ||
53 | shift = 32; | ||
54 | do { | ||
55 | temp = (u64) NSEC_PER_SEC << shift; | ||
56 | do_div(temp, hz); | ||
57 | if ((temp >> 32) == 0) | ||
58 | break; | ||
59 | } while (--shift != 0); | ||
60 | |||
61 | cs->shift = shift; | ||
62 | cs->mult = (u32) temp; | ||
63 | |||
64 | printk(KERN_INFO "clocksource: %s uses shift %u mult %#x\n", | ||
65 | cs->name, cs->shift, cs->mult); | ||
66 | } | ||
67 | |||
68 | /* | 52 | /* |
69 | * IOP sched_clock() implementation via its clocksource. | 53 | * IOP sched_clock() implementation via its clocksource. |
70 | */ | 54 | */ |
@@ -130,27 +114,6 @@ static struct clock_event_device iop_clockevent = { | |||
130 | .set_mode = iop_set_mode, | 114 | .set_mode = iop_set_mode, |
131 | }; | 115 | }; |
132 | 116 | ||
133 | static void __init iop_clockevent_set_hz(struct clock_event_device *ce, unsigned int hz) | ||
134 | { | ||
135 | u64 temp; | ||
136 | u32 shift; | ||
137 | |||
138 | /* Find shift and mult values for hz. */ | ||
139 | shift = 32; | ||
140 | do { | ||
141 | temp = (u64) hz << shift; | ||
142 | do_div(temp, NSEC_PER_SEC); | ||
143 | if ((temp >> 32) == 0) | ||
144 | break; | ||
145 | } while (--shift != 0); | ||
146 | |||
147 | ce->shift = shift; | ||
148 | ce->mult = (u32) temp; | ||
149 | |||
150 | printk(KERN_INFO "clockevent: %s uses shift %u mult %#lx\n", | ||
151 | ce->name, ce->shift, ce->mult); | ||
152 | } | ||
153 | |||
154 | static irqreturn_t | 117 | static irqreturn_t |
155 | iop_timer_interrupt(int irq, void *dev_id) | 118 | iop_timer_interrupt(int irq, void *dev_id) |
156 | { | 119 | { |
@@ -190,7 +153,8 @@ void __init iop_init_time(unsigned long tick_rate) | |||
190 | */ | 153 | */ |
191 | write_tmr0(timer_ctl & ~IOP_TMR_EN); | 154 | write_tmr0(timer_ctl & ~IOP_TMR_EN); |
192 | setup_irq(IRQ_IOP_TIMER0, &iop_timer_irq); | 155 | setup_irq(IRQ_IOP_TIMER0, &iop_timer_irq); |
193 | iop_clockevent_set_hz(&iop_clockevent, tick_rate); | 156 | clockevents_calc_mult_shift(&iop_clockevent, |
157 | tick_rate, IOP_MIN_RANGE); | ||
194 | iop_clockevent.max_delta_ns = | 158 | iop_clockevent.max_delta_ns = |
195 | clockevent_delta2ns(0xfffffffe, &iop_clockevent); | 159 | clockevent_delta2ns(0xfffffffe, &iop_clockevent); |
196 | iop_clockevent.min_delta_ns = | 160 | iop_clockevent.min_delta_ns = |
@@ -207,6 +171,7 @@ void __init iop_init_time(unsigned long tick_rate) | |||
207 | write_trr1(0xffffffff); | 171 | write_trr1(0xffffffff); |
208 | write_tcr1(0xffffffff); | 172 | write_tcr1(0xffffffff); |
209 | write_tmr1(timer_ctl); | 173 | write_tmr1(timer_ctl); |
210 | iop_clocksource_set_hz(&iop_clocksource, tick_rate); | 174 | clocksource_calc_mult_shift(&iop_clocksource, tick_rate, |
175 | IOP_MIN_RANGE); | ||
211 | clocksource_register(&iop_clocksource); | 176 | clocksource_register(&iop_clocksource); |
212 | } | 177 | } |