commit 70a26a219cc0eedae4529c27fe1abfb2a02e373b
author David Daney <ddaney@caviumnetworks.com> Tue Aug 21 11:45:05 2012 -0700
committer David Daney <david.daney@cavium.com> Fri Aug 31 11:48:48 2012 -0700
tree 30b51a8344ba6bb97196fcb5c864a2fa2471b1cf
parent 2432cbe4f29fbb8d349e481695ac6e88b884bacb

MIPS: Octeon: Add octeon_io_clk_delay() function.

Also cleanup and fix octeon_init_cvmcount()

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Acked-by: David S. Miller <davem@davemloft.net>

arch/mips/cavium-octeon/setup.c

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 919b0fb..04dd8ff 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -548,6 +548,8 @@
 	}
 #endif
 
+	octeon_setup_delays();
+
 	/*
 	 * BIST should always be enabled when doing a soft reset. L2
 	 * Cache locking for instance is not cleared unless BIST is
@@ -611,7 +613,6 @@
 	mips_hpt_frequency = octeon_get_clock_rate();
 
 	octeon_init_cvmcount();
-	octeon_setup_delays();
 
 	_machine_restart = octeon_restart;
 	_machine_halt = octeon_halt;