diff options
| author |   Joseph Lo <josephl@nvidia.com> | 2013-01-07 10:56:14 +0800 |
|---|---|---|
| committer |   Stephen Warren <swarren@nvidia.com> | 2013-01-28 11:14:43 -0700 |
| commit | 1395868c06bd41390e50e7c7fe9a4783dd620867 (patch) | |
| tree | 3bd83dd1fef35e8a5dbd587bc8a9a0479942145c /arch/arm/mach-tegra | |
| parent | ARM: tegra: make device can run on UP (diff) | |
| download | linux-dev-1395868c06bd41390e50e7c7fe9a4783dd620867.tar.xz linux-dev-1395868c06bd41390e50e7c7fe9a4783dd620867.zip | |
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/mach-tegra')
| -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) * next time around. */ if (cpumask_test_cpu(cpu, &tegra_cpu_init_mask)) { - timeout = jiffies + 5*HZ; + timeout = jiffies + msecs_to_jiffies(50); do { if (!tegra_powergate_is_powered(pwrgateid)) goto remove_clamps; @@ -110,7 +110,7 @@ static int tegra30_power_up_cpu(unsigned int cpu) return ret; /* Wait for the power to come up. */ - timeout = jiffies + 10*HZ; + timeout = jiffies + msecs_to_jiffies(100); while (tegra_powergate_is_powered(pwrgateid)) { if (time_after(jiffies, timeout)) return -ETIMEDOUT; |