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>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 919b0fb7bb1..04dd8ff0e0d 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -548,6 +548,8 @@ void __init prom_init(void)
         }
 #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 @@ void __init prom_init(void)
         mips_hpt_frequency = octeon_get_clock_rate();
 
         octeon_init_cvmcount();
-        octeon_setup_delays();
 
         _machine_restart = octeon_restart;
         _machine_halt = octeon_halt;