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

Commit cfb63baf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 

Pull slave-dmaengine fixes from Vinod Koul:
 "The first one fixes issue in pl330 to check for DT compatible and
  the second one fixes omap-dma to start without delay"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: omap-dma: Start DMA without delay for cyclic channels
  DMA: PL330: Add check if device tree compatible
parents a3ab02b4 76502469

drivers/dma/omap-dma.c

+14 −6
Original line number Diff line number Diff line
@@ -276,12 +276,20 @@ static void omap_dma_issue_pending(struct dma_chan *chan) 


	spin_lock_irqsave(&c->vc.lock, flags);

	if (vchan_issue_pending(&c->vc) && !c->desc) {

		/*

		 * c->cyclic is used only by audio and in this case the DMA need

		 * to be started without delay.

		 */

		if (!c->cyclic) {

			struct omap_dmadev *d = to_omap_dma_dev(chan->device);

			spin_lock(&d->lock);

			if (list_empty(&c->node))

				list_add_tail(&c->node, &d->pending);

			spin_unlock(&d->lock);

			tasklet_schedule(&d->task);

		} else {

			omap_dma_start_desc(c);

		}

	}

	spin_unlock_irqrestore(&c->vc.lock, flags);

}

drivers/dma/pl330.c

+27 −11
Original line number Diff line number Diff line
@@ -2882,7 +2882,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
{

	struct dma_pl330_platdata *pdat;

	struct dma_pl330_dmac *pdmac;

	struct dma_pl330_chan *pch;

	struct dma_pl330_chan *pch, *_p;

	struct pl330_info *pi;

	struct dma_device *pd;

	struct resource *res;
@@ -2984,7 +2984,16 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
	ret = dma_async_device_register(pd);

	if (ret) {

		dev_err(&adev->dev, "unable to register DMAC\n");

		goto probe_err2;

		goto probe_err3;

	}



	if (adev->dev.of_node) {

		ret = of_dma_controller_register(adev->dev.of_node,

					 of_dma_pl330_xlate, pdmac);

		if (ret) {

			dev_err(&adev->dev,

			"unable to register DMA to the generic DT DMA helpers\n");

		}

	}



	dev_info(&adev->dev,
@@ -2995,16 +3004,21 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
		pi->pcfg.data_bus_width / 8, pi->pcfg.num_chan,

		pi->pcfg.num_peri, pi->pcfg.num_events);



	ret = of_dma_controller_register(adev->dev.of_node,

					 of_dma_pl330_xlate, pdmac);

	if (ret) {

		dev_err(&adev->dev,

		"unable to register DMA to the generic DT DMA helpers\n");

		goto probe_err2;

	}



	return 0;

probe_err3:

	amba_set_drvdata(adev, NULL);



	/* Idle the DMAC */

	list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,

			chan.device_node) {



		/* Remove the channel */

		list_del(&pch->chan.device_node);



		/* Flush the channel */

		pl330_control(&pch->chan, DMA_TERMINATE_ALL, 0);

		pl330_free_chan_resources(&pch->chan);

	}

probe_err2:

	pl330_del(pi);

probe_err1:
@@ -3023,8 +3037,10 @@ static int pl330_remove(struct amba_device *adev) 
	if (!pdmac)

		return 0;



	if (adev->dev.of_node)

		of_dma_controller_free(adev->dev.of_node);



	dma_async_device_unregister(&pdmac->ddma);

	amba_set_drvdata(adev, NULL);



	/* Idle the DMAC */