Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[linux-2.6-microblaze.git] / arch / arm / plat-mxc / irq.c

diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
index e937c87..6e7578a 100644 (file)
--- a/arch/arm/plat-mxc/irq.c
+++ b/arch/arm/plat-mxc/irq.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <mach/common.h>
 #include <asm/mach/irq.h>
+#include <mach/hardware.h>
 
 #define AVIC_BASE              IO_ADDRESS(AVIC_BASE_ADDR)
 #define AVIC_INTCNTL           (AVIC_BASE + 0x00)      /* int control reg */
@@ -72,14 +73,14 @@ int mxc_set_irq_fiq(unsigned int irq, unsigned int type)
 {
        unsigned int irqt;
 
-       if (irq >= MXC_MAX_INT_LINES)
+       if (irq >= MXC_INTERNAL_IRQS)
                return -EINVAL;
 
-       if (irq < MXC_MAX_INT_LINES / 2) {
+       if (irq < MXC_INTERNAL_IRQS / 2) {
                irqt = __raw_readl(AVIC_INTTYPEL) & ~(1 << irq);
                __raw_writel(irqt | (!!type << irq), AVIC_INTTYPEL);
        } else {
-               irq -= MXC_MAX_INT_LINES / 2;
+               irq -= MXC_INTERNAL_IRQS / 2;
                irqt = __raw_readl(AVIC_INTTYPEH) & ~(1 << irq);
                __raw_writel(irqt | (!!type << irq), AVIC_INTTYPEH);
        }
@@ -129,7 +130,7 @@ void __init mxc_init_irq(void)
        /* all IRQ no FIQ */
        __raw_writel(0, AVIC_INTTYPEH);
        __raw_writel(0, AVIC_INTTYPEL);
-       for (i = 0; i < MXC_MAX_INT_LINES; i++) {
+       for (i = 0; i < MXC_INTERNAL_IRQS; i++) {
                set_irq_chip(i, &mxc_avic_chip);
                set_irq_handler(i, handle_level_irq);
                set_irq_flags(i, IRQF_VALID);