diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-18 15:20:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:48 -0800 |
| commit | 07e32729adeff79693e0da4f64ade4a64f52b024 (patch) | |
| tree | 1dad1a27668df6e24bb91bbb854d472644e2406e /arch/arm/mach-tegra/cpuidle-t2.c | |
| parent | a30f93203f93896205fc7de4956a05b285846c62 (diff) | |
ARM: tegra: Split sleep.S for Tegra2
Change-Id: I22bbfe62c6fed753a6852b12246f4a1f2414a96f
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R2d7985afe7ffafac651d747205e528331f5f993e
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle-t2.c')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle-t2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-t2.c b/arch/arm/mach-tegra/cpuidle-t2.c index badeeccf98fa..d8523661016d 100644 --- a/arch/arm/mach-tegra/cpuidle-t2.c +++ b/arch/arm/mach-tegra/cpuidle-t2.c @@ -74,7 +74,7 @@ static int tegra2_reset_sleeping_cpu(int cpu) tegra_pen_lock(); if (readl(pmc + PMC_SCRATCH41) == CPU_RESETTABLE) - tegra_cpu_reset(cpu); + tegra2_cpu_reset(cpu); else ret = -EINVAL; @@ -140,7 +140,7 @@ static int tegra2_idle_lp2_last(struct cpuidle_device *dev, { int i; - while (tegra_cpu_is_resettable_soon()) + while (tegra2_cpu_is_resettable_soon()) cpu_relax(); if (tegra2_reset_other_cpus(dev->cpu)) @@ -176,7 +176,7 @@ void tegra2_idle_lp2(struct cpuidle_device *dev, } } } else - tegra_sleep_wfi(PLAT_PHYS_OFFSET - PAGE_OFFSET); + tegra2_sleep_wfi(PLAT_PHYS_OFFSET - PAGE_OFFSET); cpu_pm_exit(); tegra_clear_cpu_in_lp2(dev->cpu); |