spi: omap2-mcspi: convert to dma_request_slave_channel_compat()

Convert dmaengine channel requests to use
dma_request_slave_channel_compat(). This supports the DT case of
platforms requiring channel selection from either the OMAP DMA or
the EDMA engine. AM33xx only boots from DT and is the only user
implementing EDMA so in the !DT case we can default to the OMAP DMA
filter.

Signed-off-by: Matt Porter <mporter@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 61eef47ae82109d40f549cb4509e890eeb224e08..642f5f8db532b87ea9f3956a6e73b82d0d19665d 100644 (file)
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -102,6 +102,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
@@ -826,14 +829,23 @@ 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) {
                dev_err(&spi->dev, "no RX DMA engine channel for McSPI\n");
                return -EAGAIN;
        }
 
        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) {
                dev_err(&spi->dev, "no TX DMA engine channel for McSPI\n");
                dma_release_channel(mcspi_dma->dma_rx);
@@ -1244,12 +1256,13 @@ 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);
+               sprintf(dma_rx_ch_name, "rx%d", i);
                dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
-                               dma_ch_name);
+                               dma_rx_ch_name);
                if (!dma_res) {
                        dev_dbg(&pdev->dev, "cannot get DMA RX channel\n");
                        status = -ENODEV;
@@ -1257,9 +1270,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
                }
 
                mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start;
-               sprintf(dma_ch_name, "tx%d", i);
+               sprintf(dma_tx_ch_name, "tx%d", i);
                dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
-                               dma_ch_name);
+                               dma_tx_ch_name);
                if (!dma_res) {
                        dev_dbg(&pdev->dev, "cannot get DMA TX channel\n");
                        status = -ENODEV;