diff options
| author |   David Daney <ddaney@caviumnetworks.com> | 2010-06-01 13:18:15 -0700 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 13:26:20 +0100 |
| commit | ca148125e6134de334b61822539d220794d8da18 (patch) | |
| tree | e31af5840a8873ec6613bf9b09fe0f9ad3e6a9c7 /arch/mips/cavium-octeon/setup.c | |
| parent | MIPS: JZ4740: Add qi_lb60 board support (diff) | |
| download | linux-dev-ca148125e6134de334b61822539d220794d8da18.tar.xz linux-dev-ca148125e6134de334b61822539d220794d8da18.zip | |
MIPS: Octeon: Implement delays with cycle counter.
Power throttling make deterministic delay loops impossible.
Re-implement delays using the cycle counter. This also allows us to
get rid of the code that calculates loops per jiffy.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1317/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 8c81a5c5bbab..7216fbd5d79d 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -594,13 +594,13 @@ void __init prom_init(void) * the filesystem. Also specify the calibration delay * to avoid calculating it every time. */ - strcat(arcs_cmdline, " rw root=1f00" - " lpj=60176 slram=root,0x40000000,+1073741824"); + strcat(arcs_cmdline, " rw root=1f00 slram=root,0x40000000,+1073741824"); } mips_hpt_frequency = octeon_get_clock_rate(); octeon_init_cvmcount(); + octeon_setup_delays(); _machine_restart = octeon_restart; _machine_halt = octeon_halt; |