diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-08-31 19:24:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:41 -0800 |
| commit | 08918c28a9795e2aa5a062939d7ffa6abfcffafb (patch) | |
| tree | e66909aa21fb8c94ce6e8cb9ecc6d7ceb21c2894 /arch/arm/mach-tegra/powerdetect.c | |
| parent | 0378767eda01b220f12ed5df7ed8ce9f25b9f200 (diff) | |
ARM: tegra: Use forward looking architecture conditionals
Change-Id: I31f2717327a627ad83e4cc2f083b71fd68fb1465
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50221
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: Rcaef7248cf06aa01c40b8e5eae13e3a20ed097d3
Diffstat (limited to 'arch/arm/mach-tegra/powerdetect.c')
| -rw-r--r-- | arch/arm/mach-tegra/powerdetect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/powerdetect.c b/arch/arm/mach-tegra/powerdetect.c index 1cbbb57ffde6..b759083330ba 100644 --- a/arch/arm/mach-tegra/powerdetect.c +++ b/arch/arm/mach-tegra/powerdetect.c @@ -79,11 +79,11 @@ static struct pwr_detect_cell pwr_detect_cells[] = { POWER_CELL("pwrdet_nand", (0x1 << 1), (0x1 << 1), 0xFFFFFFFF), POWER_CELL("pwrdet_uart", (0x1 << 2), (0x1 << 2), 0xFFFFFFFF), POWER_CELL("pwrdet_bb", (0x1 << 3), (0x1 << 3), 0xFFFFFFFF), -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifdef CONFIG_ARCH_TEGRA_2x_SOC + POWER_CELL("pwrdet_vi", 0, (0x1 << 4), 0xFFFFFFFF), +#else /* Tegra3 VI is connected on MID package only (id = 1, mask = 0x2) */ POWER_CELL("pwrdet_vi", 0, (0x1 << 4), 0x00000002), -#else - POWER_CELL("pwrdet_vi", 0, (0x1 << 4), 0xFFFFFFFF), #endif POWER_CELL("pwrdet_audio", (0x1 << 5), (0x1 << 5), 0xFFFFFFFF), POWER_CELL("pwrdet_lcd", (0x1 << 6), (0x1 << 6), 0xFFFFFFFF), |