summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/csrc-ioasic.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-09-05 20:54:00 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-09-05 20:54:00 +0200
commit356948f042c59d94dc6700455263b7739f09e6b0 (patch)
treedc4acdea069607d581596670d83bf576636bde59 /arch/mips/kernel/csrc-ioasic.c
parentMerge branch '3.11-fixes' into mips-for-linux-next (diff)
parentMIPS: kexec: Fix random crashes while loading crashkernel (diff)
downloadlinux-356948f042c59d94dc6700455263b7739f09e6b0.tar.xz
linux-356948f042c59d94dc6700455263b7739f09e6b0.zip
Merge branch '3.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/csrc-ioasic.c')
-rw-r--r--arch/mips/kernel/csrc-ioasic.c6
1 files changed, 3 insertions, 3 deletions
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)
{
unsigned int freq;
u32 start, end;
- int i = HZ / 10;
-
+ int i = HZ / 8;
+ ds1287_timer_state();
while (!ds1287_timer_state())
;
@@ -55,7 +55,7 @@ void __init dec_ioasic_clocksource_init(void)
end = dec_ioasic_hpt_read(&clocksource_dec);
- freq = (end - start) * 10;
+ freq = (end - start) * 8;
printk(KERN_INFO "I/O ASIC clock frequency %dHz\n", freq);
clocksource_dec.rating = 200 + freq / 10000000;