diff options
author | Joseph Lo <josephl@nvidia.com> | 2013-01-06 21:56:14 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 13:14:43 -0500 |
commit | 1395868c06bd41390e50e7c7fe9a4783dd620867 (patch) | |
tree | 3bd83dd1fef35e8a5dbd587bc8a9a0479942145c /arch/arm | |
parent | 9e32366fe51fea464adb21c244f372d55207e13c (diff) |
ARM: tegra30: make the wait time of CPU power up to proportional to HZ
It would rather to use the API of time_to_jiffies than a constant number
of jiffies for the wait time of CPU power up.
Based on the work by:
Sang-Hun Lee <sanlee@nvidia.com>
Signed-off-by: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index 60daf9f945cb..68670304d9bc 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c | |||
@@ -90,7 +90,7 @@ static int tegra30_power_up_cpu(unsigned int cpu) | |||
90 | * next time around. | 90 | * next time around. |
91 | */ | 91 | */ |
92 | if (cpumask_test_cpu(cpu, &tegra_cpu_init_mask)) { | 92 | if (cpumask_test_cpu(cpu, &tegra_cpu_init_mask)) { |
93 | timeout = jiffies + 5*HZ; | 93 | timeout = jiffies + msecs_to_jiffies(50); |
94 | do { | 94 | do { |
95 | if (!tegra_powergate_is_powered(pwrgateid)) | 95 | if (!tegra_powergate_is_powered(pwrgateid)) |
96 | goto remove_clamps; | 96 | goto remove_clamps; |
@@ -110,7 +110,7 @@ static int tegra30_power_up_cpu(unsigned int cpu) | |||
110 | return ret; | 110 | return ret; |
111 | 111 | ||
112 | /* Wait for the power to come up. */ | 112 | /* Wait for the power to come up. */ |
113 | timeout = jiffies + 10*HZ; | 113 | timeout = jiffies + msecs_to_jiffies(100); |
114 | while (tegra_powergate_is_powered(pwrgateid)) { | 114 | while (tegra_powergate_is_powered(pwrgateid)) { |
115 | if (time_after(jiffies, timeout)) | 115 | if (time_after(jiffies, timeout)) |
116 | return -ETIMEDOUT; | 116 | return -ETIMEDOUT; |