ARM: tegra: power: Use Tegra3 LP2 timer functions for Tegra11x
Scott Williams [Thu, 1 Sep 2011 23:44:16 +0000 (16:44 -0700)]
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

arch/arm/mach-tegra/pm.h

index 421b21a..fe685d4 100644 (file)
@@ -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
 }