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

Commit 2d1a9a94 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: omap-dma: Dynamically allocate memory for lch_map 



On OMAP1 platforms we do not have 32 channels available. Allocate the
lch_map based on the available channels. This way we are not going to have
more visible channels then it is available on the platform.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent b57ebe08

drivers/dma/omap-dma.c

+14 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct omap_dmadev { 
	unsigned dma_requests;

	spinlock_t irq_lock;

	uint32_t irq_enable_mask;

	struct omap_chan *lch_map[OMAP_SDMA_CHANNELS];

	struct omap_chan **lch_map;

};



struct omap_chan {
@@ -1223,16 +1223,24 @@ static int omap_dma_probe(struct platform_device *pdev) 
	spin_lock_init(&od->lock);

	spin_lock_init(&od->irq_lock);



	if (!pdev->dev.of_node) {

		od->dma_requests = od->plat->dma_attr->lch_count;

		if (unlikely(!od->dma_requests))

			od->dma_requests = OMAP_SDMA_REQUESTS;

	if (pdev->dev.of_node && of_property_read_u32(pdev->dev.of_node,

						      "dma-requests",

	} else if (of_property_read_u32(pdev->dev.of_node, "dma-requests",

					&od->dma_requests)) {

		dev_info(&pdev->dev,

			 "Missing dma-requests property, using %u.\n",

			 OMAP_SDMA_REQUESTS);

		od->dma_requests = OMAP_SDMA_REQUESTS;

	}



	for (i = 0; i < OMAP_SDMA_CHANNELS; i++) {

	od->lch_map = devm_kcalloc(&pdev->dev, od->dma_requests,

				   sizeof(*od->lch_map), GFP_KERNEL);

	if (!od->lch_map)

		return -ENOMEM;



	for (i = 0; i < od->dma_requests; i++) {

		rc = omap_dma_chan_init(od);

		if (rc) {

			omap_dma_free(od);