From ff241c1034ebccc06bbb2bd6fed906013d1be180 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 19 Oct 2009 15:25:13 -0700
Subject: [PATCH] --- yaml --- r: 172707 b: refs/heads/master c:
 1b26fe868a7eb39df924f1173fb43a5c8d640822 h: refs/heads/master i:   172705:
 d266de6216700562f0085bb2c3eedc5dc96c6529   172703:
 947d5c411e57b814deab235f6b7fd3e7f6aa15d1 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-omap2/irq.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11d5ac19dfb2..8ee1be18e76f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f90c9cc81d8db172d4f768fc4010f508897366
+refs/heads/master: 1b26fe868a7eb39df924f1173fb43a5c8d640822
diff --git a/trunk/arch/arm/mach-omap2/irq.c b/trunk/arch/arm/mach-omap2/irq.c
index b82863887f10..1db121f437d2 100644
--- a/trunk/arch/arm/mach-omap2/irq.c
+++ b/trunk/arch/arm/mach-omap2/irq.c
@@ -178,12 +178,20 @@ void __init omap_init_irq(void)
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
+		unsigned long base;
 		struct omap_irq_bank *bank = irq_banks + i;
 
 		if (cpu_is_omap24xx())
-			bank->base_reg = OMAP2_IO_ADDRESS(OMAP24XX_IC_BASE);
+			base = OMAP24XX_IC_BASE;
 		else if (cpu_is_omap34xx())
-			bank->base_reg = OMAP2_IO_ADDRESS(OMAP34XX_IC_BASE);
+			base = OMAP34XX_IC_BASE;
+
+		/* Static mapping, never released */
+		bank->base_reg = ioremap(base, SZ_4K);
+		if (!bank->base_reg) {
+			printk(KERN_ERR "Could not ioremap irq bank%i\n", i);
+			continue;
+		}
 
 		omap_irq_bank_init_one(bank);