From c34feff732b907c2bc8e9e129d6852879d3c2ad7 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 25 May 2009 10:50:52 +0200 Subject: [PATCH] --- yaml --- r: 160874 b: refs/heads/master c: 12b8eb865285c95d6e2c02555f066e3f949e090d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/entry-macro.S | 3 ++- trunk/arch/arm/plat-mxc/irq.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f121143deef..9460d37920e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c372a5cf4cde161c7f59bbe7a9ebcfce9cb2c2f8 +refs/heads/master: 12b8eb865285c95d6e2c02555f066e3f949e090d diff --git a/trunk/arch/arm/plat-mxc/include/mach/entry-macro.S b/trunk/arch/arm/plat-mxc/include/mach/entry-macro.S index 5f01d60da845..7cf290efe768 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/entry-macro.S +++ b/trunk/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/trunk/arch/arm/plat-mxc/irq.c b/trunk/arch/arm/plat-mxc/irq.c index 618a8b24ed12..778ddfe57d89 100644 --- a/trunk/arch/arm/plat-mxc/irq.c +++ b/trunk/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) {