Commit 6d4c8830 authored by Suman Anna's avatar Suman Anna Committed by Paul Walmsley

ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data

Commit 7d7e1eba (ARM: OMAP2+: Prepare for irqs.h removal) and commit
ec2c0825 (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: default avatarSuman Anna <s-anna@ti.com>
Fixes: 7d7e1eba ("ARM: OMAP2+: Prepare for irqs.h removal")
Fixes: ec2c0825 ("ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ")
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 38958c15
...@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = { ...@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = {
/* gpmc */ /* gpmc */
static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = { static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = {
{ .irq = 20 }, { .irq = 20 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = { ...@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = {
}; };
static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = { static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = {
{ .irq = 52 }, { .irq = 52 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
......
...@@ -2172,7 +2172,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = { ...@@ -2172,7 +2172,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = {
}; };
static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = {
{ .irq = 20 }, { .irq = 20 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -3006,7 +3006,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = { ...@@ -3006,7 +3006,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = {
static struct omap_hwmod omap3xxx_mmu_isp_hwmod; static struct omap_hwmod omap3xxx_mmu_isp_hwmod;
static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {
{ .irq = 24 }, { .irq = 24 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
...@@ -3048,7 +3048,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = { ...@@ -3048,7 +3048,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
static struct omap_hwmod omap3xxx_mmu_iva_hwmod; static struct omap_hwmod omap3xxx_mmu_iva_hwmod;
static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = { static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {
{ .irq = 28 }, { .irq = 28 + OMAP_INTC_START, },
{ .irq = -1 } { .irq = -1 }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment