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

Commit 9ab1fac4 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: omap-mcbsp: Use different method for DMA request when booted with DT 



The DMA resource no longer available via this API when booting with DT.
When the board is booted with DT do not use platform_get_resource_byname(),
instead set the dma_data.filter_data to the name of the DMA channel and omap-pcm
can use this name to request the DMA channel.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 2ebef447

sound/soc/omap/mcbsp.c

+22 −17
Original line number Diff line number Diff line
@@ -1012,28 +1012,33 @@ int omap_mcbsp_init(struct platform_device *pdev) 
		}

	}



	if (!pdev->dev.of_node) {

		res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");

		if (!res) {

			dev_err(&pdev->dev, "invalid tx DMA channel\n");

			return -ENODEV;

		}

		mcbsp->dma_req[0] = res->start;

		mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];



		res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");

		if (!res) {

			dev_err(&pdev->dev, "invalid rx DMA channel\n");

			return -ENODEV;

		}

	/* RX DMA request number, and port address configuration */

		mcbsp->dma_req[1] = res->start;

		mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];

	mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);

	mcbsp->dma_data[1].maxburst = 4;



	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");

	if (!res) {

		dev_err(&pdev->dev, "invalid tx DMA channel\n");

		return -ENODEV;

	} else {

		mcbsp->dma_data[0].filter_data = "tx";

		mcbsp->dma_data[1].filter_data = "rx";

	}

	/* TX DMA request number, and port address configuration */

	mcbsp->dma_req[0] = res->start;

	mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];



	mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp, 0);

	mcbsp->dma_data[0].maxburst = 4;



	mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);

	mcbsp->dma_data[1].maxburst = 4;



	mcbsp->fclk = clk_get(&pdev->dev, "fck");

	if (IS_ERR(mcbsp->fclk)) {

		ret = PTR_ERR(mcbsp->fclk);