diff options
-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 @@ | |||
18 | .endm | 18 | .endm |
19 | 19 | ||
20 | .macro get_irqnr_preamble, base, tmp | 20 | .macro get_irqnr_preamble, base, tmp |
21 | ldr \base, =AVIC_IO_ADDRESS(AVIC_BASE_ADDR) | 21 | ldr \base, =avic_base |
22 | ldr \base, [\base] | ||
22 | #ifdef CONFIG_MXC_IRQ_PRIOR | 23 | #ifdef CONFIG_MXC_IRQ_PRIOR |
23 | ldr r4, [\base, #AVIC_NIMASK] | 24 | ldr r4, [\base, #AVIC_NIMASK] |
24 | #endif | 25 | #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 @@ | |||
44 | #define AVIC_FIPNDH 0x60 /* fast int pending high */ | 44 | #define AVIC_FIPNDH 0x60 /* fast int pending high */ |
45 | #define AVIC_FIPNDL 0x64 /* fast int pending low */ | 45 | #define AVIC_FIPNDL 0x64 /* fast int pending low */ |
46 | 46 | ||
47 | static void __iomem *avic_base; | 47 | void __iomem *avic_base; |
48 | 48 | ||
49 | int imx_irq_set_priority(unsigned char irq, unsigned char prio) | 49 | int imx_irq_set_priority(unsigned char irq, unsigned char prio) |
50 | { | 50 | { |