shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-19 20:10:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk30:modify dma_alloc_coherent operation for spim

Browse Source
This commit is contained in:
lw
2012-02-29 17:22:57 +08:00
parent 6f7639d3d1
commit 374db121dd
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/spi/rk29_spim.c
View File

@@ -469,6 +469,20 @@ static int acquire_dma(struct rk29xx_spi *dws)
return 0;
}
dws->buffer_tx_dma = dma_alloc_coherent(&dws->pdev->dev, DMA_BUFFER_SIZE, &dws->tx_dma, GFP_KERNEL | GFP_DMA);
if (!dws->buffer_tx_dma)
{
dev_err(&dws->pdev->dev, "fail to dma tx buffer alloc\n");
return -1;
}
dws->buffer_rx_dma = dma_alloc_coherent(&dws->pdev->dev, DMA_BUFFER_SIZE, &dws->rx_dma, GFP_KERNEL | GFP_DMA);
if (!dws->buffer_rx_dma)
{
dev_err(&dws->pdev->dev, "fail to dma rx buffer alloc\n");
return -1;
}
if(rk29_dma_request(dws->rx_dmach,
&rk29_spi_dma_client, NULL) < 0) {
dev_err(&dws->master->dev, "dws->rx_dmach : %d, cannot get RxDMA\n", dws->rx_dmach);
@@ -1896,21 +1910,6 @@ static int __init rk29xx_spim_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "clk_get for spi fail(%p)\n", dws->clock_spim);
return PTR_ERR(dws->clock_spim);
}
dws->buffer_tx_dma = dma_alloc_coherent(&pdev->dev, DMA_BUFFER_SIZE, &dws->tx_dma, GFP_KERNEL | GFP_DMA);
if (!dws->buffer_tx_dma)
{
dev_err(&pdev->dev, "fail to dma tx buffer alloc\n");
goto exit;
}
dws->buffer_rx_dma = dma_alloc_coherent(&pdev->dev, DMA_BUFFER_SIZE, &dws->rx_dma, GFP_KERNEL | GFP_DMA);
if (!dws->buffer_rx_dma)
{
dev_err(&pdev->dev, "fail to dma rx buffer alloc\n");
goto exit;
}
mutex_init(&dws->dma_lock);