summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/suspend.c
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2011-05-23 22:08:42 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-05-31 18:17:24 -0700
commite970a89c04311bf505d5dbae79439ec6fcf1067c (patch)
tree240cac876eb079974c55a6260b6ed225c71d8d13 /arch/arm/mach-tegra/suspend.c
parentbc22c56ecb54ec093262cee4b1105c2503e5497e (diff)
arm: tegra: Clean up SOC conditionals
Change SOC conditionals to make them more forward-looking. Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9 Reviewed-on: http://git-master/r/32706 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/suspend.c')
-rw-r--r--arch/arm/mach-tegra/suspend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c
index 8a1810b9a0db..6c35402666cc 100644
--- a/arch/arm/mach-tegra/suspend.c
+++ b/arch/arm/mach-tegra/suspend.c
@@ -164,7 +164,7 @@ unsigned long tegra_wfi_fail_count[CONFIG_NR_CPUS];
#define FLOW_CTRL_BITMAP_CPU0 (1<<8) /* CPU0 WFI bitmap */
#endif
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
#define PMC_SCRATCH4_WAKE_CLUSTER_MASK (1<<31)
#endif
@@ -664,7 +664,7 @@ void tegra_suspend_dram(bool do_lp0)
if (!do_lp0)
tegra_cpu_lp1_map = 1;
else {
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
reg = readl(pmc + PMC_SCRATCH4);
if (is_lp_cluster())
reg |= PMC_SCRATCH4_WAKE_CLUSTER_MASK;