1 files changed, 44 insertions, 20 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 6802806d1f18..bb9afc3f043b 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -109,6 +109,9 @@ struct omap2_mcspi_dma {
 
         struct completion dma_tx_completion;
         struct completion dma_rx_completion;
+
+        char dma_rx_ch_name[14];
+        char dma_tx_ch_name[14];
 };
 
 /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
@@ -936,12 +939,20 @@ static int omap2_mcspi_request_dma(struct spi_device *spi)
         dma_cap_zero(mask);
         dma_cap_set(DMA_SLAVE, mask);
         sig = mcspi_dma->dma_rx_sync_dev;
-        mcspi_dma->dma_rx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
+
+        mcspi_dma->dma_rx =
+                dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
+                                                 &sig, &master->dev,
+                                                 mcspi_dma->dma_rx_ch_name);
         if (!mcspi_dma->dma_rx)
                 goto no_dma;
 
         sig = mcspi_dma->dma_tx_sync_dev;
-        mcspi_dma->dma_tx = dma_request_channel(mask, omap_dma_filter_fn, &sig);
+        mcspi_dma->dma_tx =
+                dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
+                                                 &sig, &master->dev,
+                                                 mcspi_dma->dma_tx_ch_name);
+
         if (!mcspi_dma->dma_tx) {
                 dma_release_channel(mcspi_dma->dma_rx);
                 mcspi_dma->dma_rx = NULL;
@@ -1374,29 +1385,42 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
                 goto free_master;
 
         for (i = 0; i < master->num_chipselect; i++) {
-                char dma_ch_name[14];
+                char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name;
+                char *dma_tx_ch_name = mcspi->dma_channels[i].dma_tx_ch_name;
                 struct resource *dma_res;
 
-                sprintf(dma_ch_name, "rx%d", i);
-                dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
-                                dma_ch_name);
-                if (!dma_res) {
-                        dev_dbg(&pdev->dev, "cannot get DMA RX channel\n");
-                        status = -ENODEV;
-                        break;
-                }
+                sprintf(dma_rx_ch_name, "rx%d", i);
+                if (!pdev->dev.of_node) {
+                        dma_res =
+                                platform_get_resource_byname(pdev,
+                                                             IORESOURCE_DMA,
+                                                             dma_rx_ch_name);
+                        if (!dma_res) {
+                                dev_dbg(&pdev->dev,
+                                        "cannot get DMA RX channel\n");
+                                status = -ENODEV;
+                                break;
+                        }
 
-                mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start;
-                sprintf(dma_ch_name, "tx%d", i);
-                dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
-                                dma_ch_name);
-                if (!dma_res) {
-                        dev_dbg(&pdev->dev, "cannot get DMA TX channel\n");
-                        status = -ENODEV;
-                        break;
+                        mcspi->dma_channels[i].dma_rx_sync_dev =
+                                dma_res->start;
                 }
+                sprintf(dma_tx_ch_name, "tx%d", i);
+                if (!pdev->dev.of_node) {
+                        dma_res =
+                                platform_get_resource_byname(pdev,
+                                                             IORESOURCE_DMA,
+                                                             dma_tx_ch_name);
+                        if (!dma_res) {
+                                dev_dbg(&pdev->dev,
+                                        "cannot get DMA TX channel\n");
+                                status = -ENODEV;
+                                break;
+                        }
 
-                mcspi->dma_channels[i].dma_tx_sync_dev = dma_res->start;
+                        mcspi->dma_channels[i].dma_tx_sync_dev =
+                                dma_res->start;
+                }
         }
 
         if (status < 0)