ARM: tegra: Use SATA and PCIE SOC architecture conditionals
Scott Williams [Thu, 1 Sep 2011 23:20:47 +0000 (16:20 -0700)]
Use the SOC architecture conditionals for determining the
presense of PCIE and SATA.

Change-Id: I312d0d1b45fc08e4938260b978d083b113ed9d66
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50379
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Ra949d477a8e96ccc7760c4974ae93909ea054bbb

arch/arm/mach-tegra/common.c

index 430ea33..1d51838 100644 (file)
@@ -175,10 +175,12 @@ void tegra_init_cache(u32 tag_latency, u32 data_latency)
 
 static void __init tegra_init_power(void)
 {
-#ifndef CONFIG_ARCH_TEGRA_2x_SOC
+#ifdef CONFIG_ARCH_TEGRA_HAS_SATA
         tegra_powergate_partition_with_clk_off(TEGRA_POWERGATE_SATA);
 #endif
+#ifdef CONFIG_ARCH_TEGRA_HAS_PCIE
        tegra_powergate_partition_with_clk_off(TEGRA_POWERGATE_PCIE);
+#endif
 }
 
 static inline unsigned long gizmo_readl(unsigned long offset)