diff options
-rw-r--r-- | arch/mips/dec/time.c | 5 | ||||
-rw-r--r-- | arch/mips/kernel/csrc-ioasic.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index ea57f39e6736..56ebc7f2bede 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
@@ -126,12 +126,13 @@ int rtc_mips_set_mmss(unsigned long nowtime) | |||
126 | void __init plat_time_init(void) | 126 | void __init plat_time_init(void) |
127 | { | 127 | { |
128 | u32 start, end; | 128 | u32 start, end; |
129 | int i = HZ / 10; | 129 | int i = HZ / 8; |
130 | 130 | ||
131 | /* Set up the rate of periodic DS1287 interrupts. */ | 131 | /* Set up the rate of periodic DS1287 interrupts. */ |
132 | ds1287_set_base_clock(HZ); | 132 | ds1287_set_base_clock(HZ); |
133 | 133 | ||
134 | if (cpu_has_counter) { | 134 | if (cpu_has_counter) { |
135 | ds1287_timer_state(); | ||
135 | while (!ds1287_timer_state()) | 136 | while (!ds1287_timer_state()) |
136 | ; | 137 | ; |
137 | 138 | ||
@@ -143,7 +144,7 @@ void __init plat_time_init(void) | |||
143 | 144 | ||
144 | end = read_c0_count(); | 145 | end = read_c0_count(); |
145 | 146 | ||
146 | mips_hpt_frequency = (end - start) * 10; | 147 | mips_hpt_frequency = (end - start) * 8; |
147 | printk(KERN_INFO "MIPS counter frequency %dHz\n", | 148 | printk(KERN_INFO "MIPS counter frequency %dHz\n", |
148 | mips_hpt_frequency); | 149 | mips_hpt_frequency); |
149 | } else if (IOASIC) | 150 | } else if (IOASIC) |
diff --git a/arch/mips/kernel/csrc-ioasic.c b/arch/mips/kernel/csrc-ioasic.c index 0654bff9b69c..87e88feb4a25 100644 --- a/arch/mips/kernel/csrc-ioasic.c +++ b/arch/mips/kernel/csrc-ioasic.c | |||
@@ -41,9 +41,9 @@ void __init dec_ioasic_clocksource_init(void) | |||
41 | { | 41 | { |
42 | unsigned int freq; | 42 | unsigned int freq; |
43 | u32 start, end; | 43 | u32 start, end; |
44 | int i = HZ / 10; | 44 | int i = HZ / 8; |
45 | |||
46 | 45 | ||
46 | ds1287_timer_state(); | ||
47 | while (!ds1287_timer_state()) | 47 | while (!ds1287_timer_state()) |
48 | ; | 48 | ; |
49 | 49 | ||
@@ -55,7 +55,7 @@ void __init dec_ioasic_clocksource_init(void) | |||
55 | 55 | ||
56 | end = dec_ioasic_hpt_read(&clocksource_dec); | 56 | end = dec_ioasic_hpt_read(&clocksource_dec); |
57 | 57 | ||
58 | freq = (end - start) * 10; | 58 | freq = (end - start) * 8; |
59 | printk(KERN_INFO "I/O ASIC clock frequency %dHz\n", freq); | 59 | printk(KERN_INFO "I/O ASIC clock frequency %dHz\n", freq); |
60 | 60 | ||
61 | clocksource_dec.rating = 200 + freq / 10000000; | 61 | clocksource_dec.rating = 200 + freq / 10000000; |