Skip to content
Browse files

ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop

The delay functions may be called by some platforms between switching to
the timer-based delay loop but before calibration. In this case, the
initial loops_per_jiffy may not be suitable for the timer (although a
compromise may be achievable) and delay times may be considered too

This patch updates loops_per_jiffy when switching to the timer-based
delay loop so that delays are consistent prior to calibration.

Signed-off-by: Will Deacon <>
Signed-off-by: Russell King <>
  • Loading branch information...
1 parent ad72907 commit beafa0de3d3e0d0ece7638cded879815f359f1cb @wildea01 wildea01 committed with Russell King Sep 7, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 arch/arm/lib/delay.c
1 arch/arm/lib/delay.c
@@ -59,6 +59,7 @@ void __init init_current_timer_delay(unsigned long freq)
pr_info("Switching to timer-based delay loop\n");
lpj_fine = freq / HZ;
+ loops_per_jiffy = lpj_fine;
arm_delay_ops.delay = __timer_delay;
arm_delay_ops.const_udelay = __timer_const_udelay;
arm_delay_ops.udelay = __timer_udelay;

0 comments on commit beafa0d

Please sign in to comment.
Something went wrong with that request. Please try again.