hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Matt Porter 2013-06-22 23:07:38 +05:30 committed by Mark Brown
parent d33f473dcd
commit 74f3aaad21
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/spi/spi-omap2-mcspi.c
View File

@ -109,6 +109,9 @@ struct omap2_mcspi_dma {
struct completion dma_tx_completion; struct completion dma_tx_completion;
struct completion dma_rx_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 /* 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_zero(mask);
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);
sig = mcspi_dma->dma_rx_sync_dev; 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) if (!mcspi_dma->dma_rx)
goto no_dma; goto no_dma;
sig = mcspi_dma->dma_tx_sync_dev; 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) { if (!mcspi_dma->dma_tx) {
dma_release_channel(mcspi_dma->dma_rx); dma_release_channel(mcspi_dma->dma_rx);
mcspi_dma->dma_rx = NULL; mcspi_dma->dma_rx = NULL;
@ -1374,29 +1385,42 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
goto free_master; goto free_master;
for (i = 0; i < master->num_chipselect; i++) { 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; 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, if (!pdev->dev.of_node) {
dma_ch_name); dma_res =
if (!dma_res) { platform_get_resource_byname(pdev,
dev_dbg(&pdev->dev, "cannot get DMA RX channel\n"); IORESOURCE_DMA,
status = -ENODEV; dma_rx_ch_name);
break; 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; mcspi->dma_channels[i].dma_rx_sync_dev =
sprintf(dma_ch_name, "tx%d", i); dma_res->start;
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;
} }
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) if (status < 0)