diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-08-23 14:23:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:31 -0800 |
| commit | 0963b9265afa0854cd4c6a24d20e661ed4c8ba88 (patch) | |
| tree | 1c5829db3a7aea9f9f13b77255a5e3a595542e75 /arch/arm/mach-tegra/pm-t3.c | |
| parent | 451ef25cf77c68982cc8085218da472cea2a4f25 (diff) | |
ARM: tegra: Use CONFIG_TERGA_CLUSTER_CONTROL for cluster control
Change-Id: I07c389092132e52e2bdd3deab22c10f8e1e6035c
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/48798
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R1e0c9acc87c81f9d0dc394c09d6a7b8b94c48d3f
Diffstat (limited to 'arch/arm/mach-tegra/pm-t3.c')
| -rw-r--r-- | arch/arm/mach-tegra/pm-t3.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/pm-t3.c b/arch/arm/mach-tegra/pm-t3.c index c8fa1f2ceecc..5f0e01406f2f 100644 --- a/arch/arm/mach-tegra/pm-t3.c +++ b/arch/arm/mach-tegra/pm-t3.c @@ -40,6 +40,7 @@ #include "sleep.h" #include "tegra3_emc.h" +#ifdef CONFIG_TEGRA_CLUSTER_CONTROL #define CAR_CCLK_BURST_POLICY \ (IO_ADDRESS(TEGRA_CLK_RESET_BASE) + 0x20) @@ -96,7 +97,6 @@ #define CPU_CLOCK(cpu) (0x1<<(8+cpu)) #define CPU_RESET(cpu) (0x1111ul<<(cpu)) -#ifdef CONFIG_PM_SLEEP static int cluster_switch_prolog_clock(unsigned int flags) { u32 reg; @@ -277,7 +277,6 @@ void tegra_cluster_switch_epilog(unsigned int flags) int tegra_cluster_control(unsigned int us, unsigned int flags) { -#ifdef CONFIG_PM_SLEEP static ktime_t last_g2lp; unsigned int target_cluster = flags & TEGRA_POWER_CLUSTER_MASK; @@ -345,11 +344,10 @@ int tegra_cluster_control(unsigned int us, unsigned int flags) DEBUG_CLUSTER(("%s: %s\r\n", __func__, is_lp_cluster() ? "LP" : "G")); return 0; -#else - return -ENODEV; -#endif } +#endif +#ifdef CONFIG_PM_SLEEP static u32 mc_reserved_rsv; static u32 mc_emem_arb_override; |