ARM: tegra: power: Fix warnings when hot reset is not configured
Scott Williams [Thu, 9 Jun 2011 20:04:34 +0000 (13:04 -0700)]
Change-Id: I6dbc601cde3297e7c6fd63600c588cb3774271b8
Reviewed-on: http://git-master/r/35940
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>

Rebase-Id: R18e4758ac88779a5f21c5c1a01663f08bcc35a1f

arch/arm/mach-tegra/powergate.c

index 14bd542..15d330f 100644 (file)
@@ -111,7 +111,6 @@ static powergate_partition powergate_partition_info[] = {
 };
 
 static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
-static void __iomem *mc = IO_ADDRESS(TEGRA_MC_BASE);
 
 static u32 pmc_read(unsigned long reg)
 {
@@ -123,6 +122,9 @@ static void pmc_write(u32 val, unsigned long reg)
        writel(val, pmc + reg);
 }
 
+#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
+static void __iomem *mc = IO_ADDRESS(TEGRA_MC_BASE);
+
 static u32 mc_read(unsigned long reg)
 {
        return readl(mc + reg);
@@ -133,7 +135,6 @@ static void mc_write(u32 val, unsigned long reg)
        writel(val, mc + reg);
 }
 
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
 static void mc_flush(int id)
 {
        u32 idx, rst_ctrl, rst_stat;