diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2011-06-17 02:19:12 -0500 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-06-24 11:35:51 -0700 |
| commit | ca83d242a56759c6ac8de5cac5a8461e0656fa23 (patch) | |
| tree | 05aa738a2a2aa97250a15505b721e2e9c66ce728 /arch/arm | |
| parent | 18ef4f8c43b5695043ec5e56d8df4956e6a6c9d2 (diff) | |
| download | kernel_samsung_tuna-ca83d242a56759c6ac8de5cac5a8461e0656fa23.zip kernel_samsung_tuna-ca83d242a56759c6ac8de5cac5a8461e0656fa23.tar.gz kernel_samsung_tuna-ca83d242a56759c6ac8de5cac5a8461e0656fa23.tar.bz2 | |
OMAP4: hwmod: Fix McBSP irq names
McBSP driver expects irq names "tx" and "rx". This notation is
used in OMAP2 and OMAP3, hence the hwmod information is updated
for OMAP4 McBSP1, McBSP2, McBSP3 and McBSP4 modules.
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index e8ffd2c..d3bbd50 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -2825,7 +2825,8 @@ static struct omap_hwmod_class omap44xx_mcbsp_hwmod_class = { /* mcbsp1 */ static struct omap_hwmod omap44xx_mcbsp1_hwmod; static struct omap_hwmod_irq_info omap44xx_mcbsp1_irqs[] = { - { .irq = 17 + OMAP44XX_IRQ_GIC_START }, + { .name = "tx", .irq = 17 + OMAP44XX_IRQ_GIC_START }, + { .name = "rx", .irq = 0 }, }; static struct omap_hwmod_dma_info omap44xx_mcbsp1_sdma_reqs[] = { @@ -2898,7 +2899,8 @@ static struct omap_hwmod omap44xx_mcbsp1_hwmod = { /* mcbsp2 */ static struct omap_hwmod omap44xx_mcbsp2_hwmod; static struct omap_hwmod_irq_info omap44xx_mcbsp2_irqs[] = { - { .irq = 22 + OMAP44XX_IRQ_GIC_START }, + { .name = "tx", .irq = 22 + OMAP44XX_IRQ_GIC_START }, + { .name = "rx", .irq = 0 }, }; static struct omap_hwmod_dma_info omap44xx_mcbsp2_sdma_reqs[] = { @@ -2971,7 +2973,8 @@ static struct omap_hwmod omap44xx_mcbsp2_hwmod = { /* mcbsp3 */ static struct omap_hwmod omap44xx_mcbsp3_hwmod; static struct omap_hwmod_irq_info omap44xx_mcbsp3_irqs[] = { - { .irq = 23 + OMAP44XX_IRQ_GIC_START }, + { .name = "tx", .irq = 23 + OMAP44XX_IRQ_GIC_START }, + { .name = "rx", .irq = 0 }, }; static struct omap_hwmod_dma_info omap44xx_mcbsp3_sdma_reqs[] = { @@ -3044,7 +3047,8 @@ static struct omap_hwmod omap44xx_mcbsp3_hwmod = { /* mcbsp4 */ static struct omap_hwmod omap44xx_mcbsp4_hwmod; static struct omap_hwmod_irq_info omap44xx_mcbsp4_irqs[] = { - { .irq = 16 + OMAP44XX_IRQ_GIC_START }, + { .name = "tx", .irq = 16 + OMAP44XX_IRQ_GIC_START }, + { .name = "rx", .irq = 0 }, }; static struct omap_hwmod_dma_info omap44xx_mcbsp4_sdma_reqs[] = { |