diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-01 16:44:16 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:09:25 -0700 |
| commit | 1310698a1f3efd6b5b35532ce01c2fd53cbaa267 (patch) | |
| tree | c09ccab486ca239c306920f7e5025c5de7bb377e /arch/arm/mach-tegra/pm.h | |
| parent | 5f285cee2633fff22dd4bbb55037a106ed86e2c8 (diff) | |
ARM: tegra: power: Use Tegra3 LP2 timer functions for Tegra11x
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50395
(cherry picked from commit efb2c5d7c6d873002f2f156a4c622b6e0a3aed36)
Change-Id: I23baa13790ca9cb1b445bd4e4972dd5ab9f14903
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/77456
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mark Stadler <mastadler@nvidia.com>
Tested-by: Mark Stadler <mastadler@nvidia.com>
Rebase-Id: R129f1e31d9f61caf36723806c2147d76eb40c0d1
Diffstat (limited to 'arch/arm/mach-tegra/pm.h')
| -rw-r--r-- | arch/arm/mach-tegra/pm.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index 421b21ac9342..fe685d439065 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -153,8 +153,7 @@ static inline void tegra_cluster_switch_epilog(unsigned int flags) {} void tegra2_lp0_suspend_init(void); void tegra2_lp2_set_trigger(unsigned long cycles); unsigned long tegra2_lp2_timer_remain(void); -#endif -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#else void tegra3_lp2_set_trigger(unsigned long cycles); unsigned long tegra3_lp2_timer_remain(void); int tegra3_is_lp2_timer_ready(unsigned int cpu); @@ -172,8 +171,7 @@ static inline void tegra_lp2_set_trigger(unsigned long cycles) { #ifdef CONFIG_ARCH_TEGRA_2x_SOC tegra2_lp2_set_trigger(cycles); -#endif -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#else tegra3_lp2_set_trigger(cycles); #endif } @@ -182,8 +180,7 @@ static inline unsigned long tegra_lp2_timer_remain(void) { #ifdef CONFIG_ARCH_TEGRA_2x_SOC return tegra2_lp2_timer_remain(); -#endif -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#else return tegra3_lp2_timer_remain(); #endif } |