diff options
author | Scott Williams <scwilliams@nvidia.com> | 2011-06-09 13:04:34 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:47 -0800 |
commit | a1041135b9f425cbd7cb8f90f227c6a84f03259a (patch) | |
tree | 3e41bb9a3784ea196ef4bedc8987213dbfa76620 /arch/arm | |
parent | 6e10174f41b11e2880d827e288322ba3efb7cd70 (diff) |
ARM: tegra: power: Fix warnings when hot reset is not configured
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
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/powergate.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 22bfbd3860e9..0acb6bc24f4d 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -101,7 +101,6 @@ static powergate_partition powergate_partition_info[TEGRA_NUM_POWERGATE] = { }; 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) { @@ -113,6 +112,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); @@ -123,7 +125,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; |