diff options
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index bcd83db41bbc..3926f370448f 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -23,8 +23,7 @@ | |||
| 23 | #include <linux/of_address.h> | 23 | #include <linux/of_address.h> |
| 24 | #include <linux/of_irq.h> | 24 | #include <linux/of_irq.h> |
| 25 | 25 | ||
| 26 | #include <mach/hardware.h> | 26 | #include "soc.h" |
| 27 | |||
| 28 | #include "iomap.h" | 27 | #include "iomap.h" |
| 29 | #include "common.h" | 28 | #include "common.h" |
| 30 | 29 | ||
| @@ -49,6 +48,8 @@ | |||
| 49 | #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) | 48 | #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) |
| 50 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */ | 49 | #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */ |
| 51 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ | 50 | #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */ |
| 51 | #define INTCPS_NR_MIR_REGS 3 | ||
| 52 | #define INTCPS_NR_IRQS 96 | ||
| 52 | 53 | ||
| 53 | /* | 54 | /* |
| 54 | * OMAP2 has a number of different interrupt controllers, each interrupt | 55 | * OMAP2 has a number of different interrupt controllers, each interrupt |
| @@ -107,9 +108,8 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | |||
| 107 | unsigned long tmp; | 108 | unsigned long tmp; |
| 108 | 109 | ||
| 109 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; | 110 | tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; |
| 110 | printk(KERN_INFO "IRQ: Found an INTC at 0x%p " | 111 | pr_info("IRQ: Found an INTC at 0x%p (revision %ld.%ld) with %d interrupts\n", |
| 111 | "(revision %ld.%ld) with %d interrupts\n", | 112 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); |
| 112 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); | ||
| 113 | 113 | ||
| 114 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); | 114 | tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); |
| 115 | tmp |= 1 << 1; /* soft reset */ | 115 | tmp |= 1 << 1; /* soft reset */ |
