diff options
| author |   Magnus Damm <damm@opensource.se> | 2012-05-10 00:37:48 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-12 22:21:36 +0200 |
| commit | 173bf69a7af142e0325fa514954f6eeb2d20cc1d (patch) | |
| tree | 5fbdacaf4b5a796bf445116c31884200164b3665 /arch/arm/mach-shmobile/timer.c | |
| parent | Merge branch 'renesas-dt' into renesas-soc-core (diff) | |
| download | linux-dev-173bf69a7af142e0325fa514954f6eeb2d20cc1d.tar.xz linux-dev-173bf69a7af142e0325fa514954f6eeb2d20cc1d.zip | |
ARM / mach-shmobile: Use preset_lpj with calibrate_delay()
Update the mach-shmobile shared delay calibration code for late
timers. All existing in-tree non-DT socs are however using early
timers today and they are unaffected by this change.
The patch modifies shmobile_setup_delay() from using lpj_fine
to preset_lpj. This change allows us to preset the worst case
loops-per-jiffy value to all CPU cores on the system.
The old code which made use of lpj_fine did not affect the
secondary CPU cores which made it impossible to boot on SMP
without early timers.
Needed for SMP SoCs using late timers like EMEV2 or any other
mach-shmobile SMP SoC that makes use of late timers via DT.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile/timer.c')
| -rw-r--r-- | arch/arm/mach-shmobile/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index cba39d866687..a68919727e24 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -36,7 +36,8 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, unsigned int value = (1000000 * mult) / (HZ * div); - lpj_fine = max_cpu_core_mhz * value; + if (!preset_lpj) + preset_lpj = max_cpu_core_mhz * value; } static void __init shmobile_late_time_init(void) |