diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 13:43:41 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:50 -0800 |
| commit | f0db0c696848c66ac60ece323e7ac2988275e16f (patch) | |
| tree | 01dadaa91ae5c4ec2ab6f91d496ac184daab84e3 /arch/arm/mach-tegra/pm.h | |
| parent | 105756ca1eaa102747611f05df37a4bd83609933 (diff) | |
ARM: tegra: Update tegra_lp0_suspend_init stubbing
Change-Id: I961125e938e72506dc304025b418e80387a5062e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R393c5a77803f276467d2974041653eb92026601e
Diffstat (limited to 'arch/arm/mach-tegra/pm.h')
| -rw-r--r-- | arch/arm/mach-tegra/pm.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index 9617fcd44cdf..dc79322c215f 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -74,13 +74,6 @@ int tegra_suspend_dram(enum tegra_suspend_mode mode); #define FUSE_SKU_DISABLE_ALL_CPUS (1<<5) #define FUSE_SKU_NUM_DISABLED_CPUS(x) (((x) >> 3) & 3) -#ifdef CONFIG_ARCH_TEGRA_2x_SOC -void tegra2_lp0_suspend_init(void); -#else -static inline void tegra2_lp0_suspend_init(void) -{ -} -#endif void __init tegra_init_suspend(struct tegra_suspend_platform_data *plat); unsigned int tegra_count_slow_cpus(unsigned long speed_limit); @@ -124,7 +117,10 @@ static inline unsigned int is_lp_cluster(void) { return 0; } #define tegra_lp0_suspend_mc() do {} while(0) #define tegra_lp0_resume_mc() do {} while(0) +void tegra2_lp0_suspend_init(void); + #else + #define INSTRUMENT_CLUSTER_SWITCH 1 /* Should be zero for shipping code */ #define DEBUG_CLUSTER_SWITCH 1 /* Should be zero for shipping code */ #define PARAMETERIZE_CLUSTER_SWITCH 1 /* Should be zero for shipping code */ @@ -148,6 +144,13 @@ void tegra_lp0_suspend_mc(void); void tegra_lp0_resume_mc(void); #endif +static inline void tegra_lp0_suspend_init(void) +{ +#ifdef CONFIG_ARCH_TEGRA_2x_SOC + tegra2_lp0_suspend_init(); +#endif +} + #ifdef CONFIG_ARCH_TEGRA_2x_SOC void tegra2_lp2_set_trigger(unsigned long cycles); unsigned long tegra2_lp2_timer_remain(void); |