Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9319b9da authored by Jorge Eduardo Candelaria's avatar Jorge Eduardo Candelaria Committed by Liam Girdwood
Browse files

ARM: McBSP: Fix request for irq in OMAP4 



In OMAP4, there is only one irq line for TX and RX paths. Use
the correct irq line to avoid errors at runtime.

Also, request irq line only once (instead of requesting for TX
and RX).

Signed-off-by: default avatarJorge Eduardo Candelaria <jorge.candelaria@ti.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent d98508a1

arch/arm/mach-omap2/mcbsp.c

+4 −8
Original line number Diff line number Diff line
@@ -186,32 +186,28 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = { 
		.phys_base      = OMAP44XX_MCBSP1_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,

		.rx_irq         = INT_24XX_MCBSP1_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP1_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP1,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP2_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,

		.rx_irq         = INT_24XX_MCBSP2_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP2_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP2,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP3_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,

		.rx_irq         = INT_24XX_MCBSP3_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP3_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP3,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP4_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,

		.rx_irq         = INT_24XX_MCBSP4_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP4_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP4,

		.ops            = &omap2_mcbsp_ops,

	},

};

arch/arm/plat-omap/mcbsp.c

+12 −8
Original line number Diff line number Diff line
@@ -778,8 +778,10 @@ int omap_mcbsp_request(unsigned int id) 
			goto err_clk_disable;

		}



		if (mcbsp->rx_irq) {

			init_completion(&mcbsp->rx_irq_completion);

		err = request_irq(mcbsp->rx_irq, omap_mcbsp_rx_irq_handler,

			err = request_irq(mcbsp->rx_irq,

					omap_mcbsp_rx_irq_handler,

					0, "McBSP", (void *)mcbsp);

			if (err != 0) {

				dev_err(mcbsp->dev, "Unable to request RX IRQ %d "
@@ -788,6 +790,7 @@ int omap_mcbsp_request(unsigned int id) 
				goto err_free_irq;

			}

		}

	}



	return 0;

err_free_irq:
@@ -835,6 +838,7 @@ void omap_mcbsp_free(unsigned int id) 


	if (mcbsp->io_type == OMAP_MCBSP_IRQ_IO) {

		/* Free IRQs */

		if (mcbsp->rx_irq)

			free_irq(mcbsp->rx_irq, (void *)mcbsp);

		free_irq(mcbsp->tx_irq, (void *)mcbsp);

	}