diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2012-08-21 20:45:05 +0200 |
|---|---|---|
| committer | David Daney <david.daney@cavium.com> | 2012-08-31 20:48:48 +0200 |
| commit | 70a26a219cc0eedae4529c27fe1abfb2a02e373b (patch) | |
| tree | 30b51a8344ba6bb97196fcb5c864a2fa2471b1cf /arch/mips/cavium-octeon/setup.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| download | linux-70a26a219cc0eedae4529c27fe1abfb2a02e373b.tar.xz linux-70a26a219cc0eedae4529c27fe1abfb2a02e373b.zip | |
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>
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 919b0fb7bb1a..04dd8ff0e0d8 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; |