Skip to content

Commit 6d4c883

Browse files
sumanannaPaul Walmsley
authored andcommitted
ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
Commit 7d7e1eb (ARM: OMAP2+: Prepare for irqs.h removal) and commit ec2c082 (ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ) updated the way interrupts for OMAP2/3 devices are defined in the HWMOD data structures to being an index plus a fixed offset (defined by OMAP_INTC_START). Couple of irqs in the OMAP2/3 hwmod data were misconfigured completely as they were missing this OMAP_INTC_START relative offset. Add this offset back to fix the incorrect irq data for the following modules: OMAP2 - GPMC, RNG OMAP3 - GPMC, ISP MMU & IVA MMU Signed-off-by: Suman Anna <[email protected]> Fixes: 7d7e1eb ("ARM: OMAP2+: Prepare for irqs.h removal") Fixes: ec2c082 ("ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ") Cc: Tony Lindgren <[email protected]> Signed-off-by: Paul Walmsley <[email protected]>
1 parent 38958c1 commit 6d4c883

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = {
796796

797797
/* gpmc */
798798
static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {
799-
{ .irq = 20 },
799+
{ .irq = 20 + OMAP_INTC_START, },
800800
{ .irq = -1 }
801801
};
802802

@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = {
841841
};
842842

843843
static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = {
844-
{ .irq = 52 },
844+
{ .irq = 52 + OMAP_INTC_START, },
845845
{ .irq = -1 }
846846
};
847847

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = {
21722172
};
21732173

21742174
static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {
2175-
{ .irq = 20 },
2175+
{ .irq = 20 + OMAP_INTC_START, },
21762176
{ .irq = -1 }
21772177
};
21782178

@@ -3006,7 +3006,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = {
30063006

30073007
static struct omap_hwmod omap3xxx_mmu_isp_hwmod;
30083008
static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {
3009-
{ .irq = 24 },
3009+
{ .irq = 24 + OMAP_INTC_START, },
30103010
{ .irq = -1 }
30113011
};
30123012

@@ -3048,7 +3048,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
30483048

30493049
static struct omap_hwmod omap3xxx_mmu_iva_hwmod;
30503050
static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {
3051-
{ .irq = 28 },
3051+
{ .irq = 28 + OMAP_INTC_START, },
30523052
{ .irq = -1 }
30533053
};
30543054

0 commit comments

Comments
 (0)