diff options
author | Matt Porter <mporter@ti.com> | 2013-05-10 08:12:34 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-05-26 14:23:10 -0400 |
commit | d272fbf0ca4a59339c768d76858f4add6ff36ace (patch) | |
tree | 7399bfd425614e36b1d2d79be24da60c4d3a7d26 | |
parent | cf5ae40b3968ca769e683b9b071685ad82ee893c (diff) |
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: Matt Porter <mporter@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 29a63d2839ec..dc89aead35a5 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -1930,14 +1930,20 @@ static int omap_hsmmc_probe(struct platform_device *pdev) | |||
1930 | dma_cap_zero(mask); | 1930 | dma_cap_zero(mask); |
1931 | dma_cap_set(DMA_SLAVE, mask); | 1931 | dma_cap_set(DMA_SLAVE, mask); |
1932 | 1932 | ||
1933 | host->rx_chan = dma_request_channel(mask, omap_dma_filter_fn, &rx_req); | 1933 | host->rx_chan = |
1934 | dma_request_slave_channel_compat(mask, omap_dma_filter_fn, | ||
1935 | &rx_req, &pdev->dev, "rx"); | ||
1936 | |||
1934 | if (!host->rx_chan) { | 1937 | if (!host->rx_chan) { |
1935 | dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req); | 1938 | dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req); |
1936 | ret = -ENXIO; | 1939 | ret = -ENXIO; |
1937 | goto err_irq; | 1940 | goto err_irq; |
1938 | } | 1941 | } |
1939 | 1942 | ||
1940 | host->tx_chan = dma_request_channel(mask, omap_dma_filter_fn, &tx_req); | 1943 | host->tx_chan = |
1944 | dma_request_slave_channel_compat(mask, omap_dma_filter_fn, | ||
1945 | &tx_req, &pdev->dev, "tx"); | ||
1946 | |||
1941 | if (!host->tx_chan) { | 1947 | if (!host->tx_chan) { |
1942 | dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); | 1948 | dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); |
1943 | ret = -ENXIO; | 1949 | ret = -ENXIO; |