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

Commit 03b96dca authored by Yong Wang's avatar Yong Wang Committed by Dan Williams
Browse files

intel_mid_dma: Allow DMAC2 to share interrupt 



Allow DMAC2 to share interrupt since exclusive interrupt line
for mrst DMAC2 is not provided on other platforms.

Signed-off-by: default avatarYong Wang <yong.y.wang@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent b306df5e

drivers/dma/intel_mid_dma.c

+1 −4
Original line number Diff line number Diff line
@@ -872,7 +872,6 @@ static int mid_setup_dma(struct pci_dev *pdev) 
{

	struct middma_device *dma = pci_get_drvdata(pdev);

	int err, i;

	unsigned int irq_level;



	/* DMA coherent memory pool for DMA descriptor allocations */

	dma->dma_pool = pci_pool_create("intel_mid_dma_desc_pool", pdev,
@@ -960,7 +959,6 @@ static int mid_setup_dma(struct pci_dev *pdev) 


	/*register irq */

	if (dma->pimr_mask) {

		irq_level = IRQF_SHARED;

		pr_debug("MDMA:Requesting irq shared for DMAC1\n");

		err = request_irq(pdev->irq, intel_mid_dma_interrupt1,

			IRQF_SHARED, "INTEL_MID_DMAC1", dma);
@@ -968,10 +966,9 @@ static int mid_setup_dma(struct pci_dev *pdev) 
			goto err_irq;

	} else {

		dma->intr_mask = 0x03;

		irq_level = 0;

		pr_debug("MDMA:Requesting irq for DMAC2\n");

		err = request_irq(pdev->irq, intel_mid_dma_interrupt2,

			0, "INTEL_MID_DMAC2", dma);

			IRQF_SHARED, "INTEL_MID_DMAC2", dma);

		if (0 != err)

			goto err_irq;

	}