diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-07 10:35:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-07 10:35:28 +0200 |
| commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
| tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /arch/arm/mach-omap1/ams-delta-fiq.c | |
| parent | tick/broadcast-hrtimer: Set name of the ce_broadcast_hrtimer (diff) | |
| parent | timers: Implement optimization for same expiry time in mod_timer() (diff) | |
| download | linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.zip | |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'arch/arm/mach-omap1/ams-delta-fiq.c')
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index d1f12095f315..ec760ae2f917 100644 --- a/arch/arm/mach-omap1/ams-delta-fiq.c +++ b/arch/arm/mach-omap1/ams-delta-fiq.c @@ -109,7 +109,8 @@ void __init ams_delta_init_fiq(void) * Since no set_type() method is provided by OMAP irq chip, * switch to edge triggered interrupt type manually. */ - offset = IRQ_ILR0_REG_OFFSET + INT_DEFERRED_FIQ * 0x4; + offset = IRQ_ILR0_REG_OFFSET + + ((INT_DEFERRED_FIQ - NR_IRQS_LEGACY) & 0x1f) * 0x4; val = omap_readl(DEFERRED_FIQ_IH_BASE + offset) & ~(1 << 1); omap_writel(val, DEFERRED_FIQ_IH_BASE + offset); @@ -149,7 +150,7 @@ void __init ams_delta_init_fiq(void) /* * Redirect GPIO interrupts to FIQ */ - offset = IRQ_ILR0_REG_OFFSET + INT_GPIO_BANK1 * 0x4; + offset = IRQ_ILR0_REG_OFFSET + (INT_GPIO_BANK1 - NR_IRQS_LEGACY) * 0x4; val = omap_readl(OMAP_IH1_BASE + offset) | 1; omap_writel(val, OMAP_IH1_BASE + offset); } |