ARM: tegra: Use forward looking architecture conditionals
Scott Williams [Thu, 1 Sep 2011 02:24:56 +0000 (19:24 -0700)]
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

arch/arm/mach-tegra/powerdetect.c

index 3358cc0..518ab51 100644 (file)
@@ -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),