diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-01-09 17:13:33 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:49:11 -0700 |
| commit | 929d1e00c964613f218bdb20e20ae26b5d36023d (patch) | |
| tree | 897ebc212131a3678eeff0692ecd10b69dbe05ed /arch/arm/common | |
| parent | 9be3167706376e9e40404bbcc3b30eff0ddc9db5 (diff) | |
arm: tegra: Tegra always needs the GIC save/restore
Tegra SOCs need GIC save/restore for more than just CONFIG_PM.
Original-Change-Id: I62b43ef5a54a9fee562976ae7c2772d8fd7b5a49
Reviewed-on: http://git-master/r/15363
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Idb793bab7c88b17ec2dfe98378b58f9d7e0bc670
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/gic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 54a6ed5592ea..604c53f5e1f3 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -39,7 +39,7 @@ struct gic_chip_data { unsigned int irq_offset; void __iomem *dist_base; void __iomem *cpu_base; -#ifdef CONFIG_PM +#if defined(CONFIG_PM) || defined(CONFIG_ARCH_TEGRA) u32 saved_enable[DIV_ROUND_UP(1020, 32)]; u32 saved_conf[DIV_ROUND_UP(1020, 16)]; u32 saved_pri[DIV_ROUND_UP(1020, 4)]; @@ -285,7 +285,7 @@ static void _gic_dist_exit(unsigned int gic_nr) writel(0, gic_data[gic_nr].dist_base + GIC_DIST_CTRL); } -#ifdef CONFIG_PM +#if defined(CONFIG_PM) || defined(CONFIG_ARCH_TEGRA) void gic_dist_save(unsigned int gic_nr) { unsigned int max_irq = gic_data[gic_nr].max_irq; |