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

Commit d272fbf0 authored by Matt Porter's avatar Matt Porter Committed by Chris Ball
Browse files

mmc: omap_hsmmc: convert to dma_request_slave_channel_compat 



Convert dmaengine channel requests to use
dma_request_slave_channel_compat(). This supports platforms booting
with or without DT populated.

Signed-off-by: default avatarMatt Porter <mporter@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent cf5ae40b

drivers/mmc/host/omap_hsmmc.c

+8 −2
Original line number Diff line number Diff line
@@ -1930,14 +1930,20 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 
	dma_cap_zero(mask);

	dma_cap_set(DMA_SLAVE, mask);



	host->rx_chan = dma_request_channel(mask, omap_dma_filter_fn, &rx_req);

	host->rx_chan =

		dma_request_slave_channel_compat(mask, omap_dma_filter_fn,

						 &rx_req, &pdev->dev, "rx");



	if (!host->rx_chan) {

		dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req);

		ret = -ENXIO;

		goto err_irq;

	}



	host->tx_chan = dma_request_channel(mask, omap_dma_filter_fn, &tx_req);

	host->tx_chan =

		dma_request_slave_channel_compat(mask, omap_dma_filter_fn,

						 &tx_req, &pdev->dev, "tx");



	if (!host->tx_chan) {

		dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req);

		ret = -ENXIO;