diff options
| author | Hemant Pedanekar <hemantp@ti.com> | 2011-02-16 08:31:39 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-16 08:31:39 -0800 |
| commit | 01001712c96f82e6317b1e09729d8fc4bcc66957 (patch) | |
| tree | b75376536771c5dd5398733b82a509bcacba8bc8 /arch/arm/mach-omap2/irq.c | |
| parent | 4bd7be22f4b25fc87e236a29da3a625621699074 (diff) | |
| download | talos-obmc-linux-01001712c96f82e6317b1e09729d8fc4bcc66957.tar.gz talos-obmc-linux-01001712c96f82e6317b1e09729d8fc4bcc66957.zip | |
TI816X: Update common OMAP machine specific sources
This patch updates the common machine specific source files with support for
TI816X.
Signed-off-by: Hemant Pedanekar <hemantp@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 23049c487c47..0b9a23d721f4 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -110,7 +110,7 @@ static void omap_mask_irq(struct irq_data *d) unsigned int irq = d->irq; int offset = irq & (~(IRQ_BITS_PER_REG - 1)); - if (cpu_is_omap34xx()) { + if (cpu_is_omap34xx() && !cpu_is_ti816x()) { int spurious = 0; /* @@ -205,6 +205,9 @@ void __init omap_init_irq(void) BUG_ON(!base); + if (cpu_is_ti816x()) + bank->nr_irqs = 128; + /* Static mapping, never released */ bank->base_reg = ioremap(base, SZ_4K); if (!bank->base_reg) { |
