diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-25 10:50:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-14 12:40:39 +0200 |
| commit | 12b8eb865285c95d6e2c02555f066e3f949e090d (patch) | |
| tree | 799de071f8af1010e6c48e06b66ccebc531339fc /arch/arm | |
| parent | c372a5cf4cde161c7f59bbe7a9ebcfce9cb2c2f8 (diff) | |
MXC: use variable for irq controller base in entry-macro.S
This allows us to determine the irq controller base address
on runtime.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/entry-macro.S | 3 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/irq.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S index 5f01d60da84..7cf290efe76 100644 --- a/arch/arm/plat-mxc/include/mach/entry-macro.S +++ b/arch/arm/plat-mxc/include/mach/entry-macro.S @@ -18,7 +18,8 @@ .endm .macro get_irqnr_preamble, base, tmp - ldr \base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR) + ldr \base, =avic_base + ldr \base, [\base] #ifdef CONFIG_MXC_IRQ_PRIOR ldr r4, [\base, #AVIC_NIMASK] #endif diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c index 618a8b24ed1..778ddfe57d8 100644 --- a/arch/arm/plat-mxc/irq.c +++ b/arch/arm/plat-mxc/irq.c @@ -44,7 +44,7 @@ #define AVIC_FIPNDH 0x60 /* fast int pending high */ #define AVIC_FIPNDL 0x64 /* fast int pending low */ -static void __iomem *avic_base; +void __iomem *avic_base; int imx_irq_set_priority(unsigned char irq, unsigned char prio) { |