diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
-rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index e1f289748c5d..72cf396a0fc2 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
@@ -41,6 +41,7 @@ static void __iomem *l2cache_base; | |||
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | static void __iomem *sar_ram_base; | 43 | static void __iomem *sar_ram_base; |
44 | static void __iomem *gic_dist_base_addr; | ||
44 | 45 | ||
45 | #ifdef CONFIG_OMAP4_ERRATA_I688 | 46 | #ifdef CONFIG_OMAP4_ERRATA_I688 |
46 | /* Used to implement memory barrier on DRAM path */ | 47 | /* Used to implement memory barrier on DRAM path */ |
@@ -95,7 +96,6 @@ void __init omap_barriers_init(void) | |||
95 | void __init gic_init_irq(void) | 96 | void __init gic_init_irq(void) |
96 | { | 97 | { |
97 | void __iomem *omap_irq_base; | 98 | void __iomem *omap_irq_base; |
98 | void __iomem *gic_dist_base_addr; | ||
99 | 99 | ||
100 | /* Static mapping, never released */ | 100 | /* Static mapping, never released */ |
101 | gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K); | 101 | gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K); |
@@ -110,6 +110,12 @@ void __init gic_init_irq(void) | |||
110 | gic_init(0, 29, gic_dist_base_addr, omap_irq_base); | 110 | gic_init(0, 29, gic_dist_base_addr, omap_irq_base); |
111 | } | 111 | } |
112 | 112 | ||
113 | void gic_dist_disable(void) | ||
114 | { | ||
115 | if (gic_dist_base_addr) | ||
116 | __raw_writel(0x0, gic_dist_base_addr + GIC_DIST_CTRL); | ||
117 | } | ||
118 | |||
113 | #ifdef CONFIG_CACHE_L2X0 | 119 | #ifdef CONFIG_CACHE_L2X0 |
114 | 120 | ||
115 | void __iomem *omap4_get_l2cache_base(void) | 121 | void __iomem *omap4_get_l2cache_base(void) |