diff options
author | Suman Anna <s-anna@ti.com> | 2013-12-23 17:53:11 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-12-25 23:41:27 -0500 |
commit | 6d4c88304794442055eaea1c07f3c7b988b8c924 (patch) | |
tree | 0a3dcead553642464e0387974f2a2e3f8b09bbe9 /arch | |
parent | 38958c15dc640a9249e4f0cd0dfb0ddc7a23464d (diff) |
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 <s-anna@ti.com>
Fixes: 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal")
Fixes: ec2c0825ca31 ("ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ")
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c index 56cebb05509e..d23c77fadb31 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | |||
@@ -796,7 +796,7 @@ struct omap_hwmod omap2xxx_counter_32k_hwmod = { | |||
796 | 796 | ||
797 | /* gpmc */ | 797 | /* gpmc */ |
798 | static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = { | 798 | static struct omap_hwmod_irq_info omap2xxx_gpmc_irqs[] = { |
799 | { .irq = 20 }, | 799 | { .irq = 20 + OMAP_INTC_START, }, |
800 | { .irq = -1 } | 800 | { .irq = -1 } |
801 | }; | 801 | }; |
802 | 802 | ||
@@ -841,7 +841,7 @@ static struct omap_hwmod_class omap2_rng_hwmod_class = { | |||
841 | }; | 841 | }; |
842 | 842 | ||
843 | static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = { | 843 | static struct omap_hwmod_irq_info omap2_rng_mpu_irqs[] = { |
844 | { .irq = 52 }, | 844 | { .irq = 52 + OMAP_INTC_START, }, |
845 | { .irq = -1 } | 845 | { .irq = -1 } |
846 | }; | 846 | }; |
847 | 847 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 9e56fabd7fa3..3bfb2db674ae 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -2172,7 +2172,7 @@ static struct omap_hwmod_class omap3xxx_gpmc_hwmod_class = { | |||
2172 | }; | 2172 | }; |
2173 | 2173 | ||
2174 | static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = { | 2174 | static struct omap_hwmod_irq_info omap3xxx_gpmc_irqs[] = { |
2175 | { .irq = 20 }, | 2175 | { .irq = 20 + OMAP_INTC_START, }, |
2176 | { .irq = -1 } | 2176 | { .irq = -1 } |
2177 | }; | 2177 | }; |
2178 | 2178 | ||
@@ -3006,7 +3006,7 @@ static struct omap_mmu_dev_attr mmu_isp_dev_attr = { | |||
3006 | 3006 | ||
3007 | static struct omap_hwmod omap3xxx_mmu_isp_hwmod; | 3007 | static struct omap_hwmod omap3xxx_mmu_isp_hwmod; |
3008 | static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = { | 3008 | static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = { |
3009 | { .irq = 24 }, | 3009 | { .irq = 24 + OMAP_INTC_START, }, |
3010 | { .irq = -1 } | 3010 | { .irq = -1 } |
3011 | }; | 3011 | }; |
3012 | 3012 | ||
@@ -3048,7 +3048,7 @@ static struct omap_mmu_dev_attr mmu_iva_dev_attr = { | |||
3048 | 3048 | ||
3049 | static struct omap_hwmod omap3xxx_mmu_iva_hwmod; | 3049 | static struct omap_hwmod omap3xxx_mmu_iva_hwmod; |
3050 | static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = { | 3050 | static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = { |
3051 | { .irq = 28 }, | 3051 | { .irq = 28 + OMAP_INTC_START, }, |
3052 | { .irq = -1 } | 3052 | { .irq = -1 } |
3053 | }; | 3053 | }; |
3054 | 3054 | ||