[PATCH 01/10] omap: Use separate init_irq functions to avoid cpu_is_omap tests early
From: Russell King - ARM Linux <hidden>
Date: 2011-06-20 09:54:45
Also in:
linux-omap
On Mon, Jun 20, 2011 at 02:23:28AM -0700, Tony Lindgren wrote:
void __init gic_init_irq(void)
{
- void __iomem *gic_cpu_base;
-
/* Static mapping, never released */
gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K);
BUG_ON(!gic_dist_base_addr);
/* Static mapping, never released */
- gic_cpu_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
- BUG_ON(!gic_cpu_base);
+ omap_irq_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
+ BUG_ON(!omap_irq_base);
- gic_init(0, 29, gic_dist_base_addr, gic_cpu_base);
+ gic_init(0, 29, gic_dist_base_addr, omap_irq_base);Why do you change this? Nothing should be using 'omap_irq_base' directly because it doesn't know what type of interrupt controller you have. The GIC IRQ entry code should be using gic_cpu_base_addr provided by the common gic driver rather than anything else.