Commit 64ebdec3 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: davinci-mcasp: Rename the pointer to davinci dma_params as dma_params

It is quite confusing to name the pointer to davinci_pcm_dma_params as
dma_data. Rename the pointer to avoid confusion.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 790bb94b
...@@ -1025,7 +1025,7 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of( ...@@ -1025,7 +1025,7 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
static int davinci_mcasp_probe(struct platform_device *pdev) static int davinci_mcasp_probe(struct platform_device *pdev)
{ {
struct davinci_pcm_dma_params *dma_data; struct davinci_pcm_dma_params *dma_params;
struct resource *mem, *ioarea, *res, *dat; struct resource *mem, *ioarea, *res, *dat;
struct davinci_mcasp_pdata *pdata; struct davinci_mcasp_pdata *pdata;
struct davinci_mcasp *mcasp; struct davinci_mcasp *mcasp;
...@@ -1094,41 +1094,41 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ...@@ -1094,41 +1094,41 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
if (dat) if (dat)
mcasp->dat_port = true; mcasp->dat_port = true;
dma_data = &mcasp->dma_params[SNDRV_PCM_STREAM_PLAYBACK]; dma_params = &mcasp->dma_params[SNDRV_PCM_STREAM_PLAYBACK];
dma_data->asp_chan_q = pdata->asp_chan_q; dma_params->asp_chan_q = pdata->asp_chan_q;
dma_data->ram_chan_q = pdata->ram_chan_q; dma_params->ram_chan_q = pdata->ram_chan_q;
dma_data->sram_pool = pdata->sram_pool; dma_params->sram_pool = pdata->sram_pool;
dma_data->sram_size = pdata->sram_size_playback; dma_params->sram_size = pdata->sram_size_playback;
if (dat) if (dat)
dma_data->dma_addr = dat->start; dma_params->dma_addr = dat->start;
else else
dma_data->dma_addr = mem->start + pdata->tx_dma_offset; dma_params->dma_addr = mem->start + pdata->tx_dma_offset;
/* Unconditional dmaengine stuff */ /* Unconditional dmaengine stuff */
mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr = dma_data->dma_addr; mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr = dma_params->dma_addr;
res = platform_get_resource(pdev, IORESOURCE_DMA, 0); res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (res) if (res)
dma_data->channel = res->start; dma_params->channel = res->start;
else else
dma_data->channel = pdata->tx_dma_channel; dma_params->channel = pdata->tx_dma_channel;
dma_data = &mcasp->dma_params[SNDRV_PCM_STREAM_CAPTURE]; dma_params = &mcasp->dma_params[SNDRV_PCM_STREAM_CAPTURE];
dma_data->asp_chan_q = pdata->asp_chan_q; dma_params->asp_chan_q = pdata->asp_chan_q;
dma_data->ram_chan_q = pdata->ram_chan_q; dma_params->ram_chan_q = pdata->ram_chan_q;
dma_data->sram_pool = pdata->sram_pool; dma_params->sram_pool = pdata->sram_pool;
dma_data->sram_size = pdata->sram_size_capture; dma_params->sram_size = pdata->sram_size_capture;
if (dat) if (dat)
dma_data->dma_addr = dat->start; dma_params->dma_addr = dat->start;
else else
dma_data->dma_addr = mem->start + pdata->rx_dma_offset; dma_params->dma_addr = mem->start + pdata->rx_dma_offset;
/* Unconditional dmaengine stuff */ /* Unconditional dmaengine stuff */
mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE].addr = dma_data->dma_addr; mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE].addr = dma_params->dma_addr;
if (mcasp->version < MCASP_VERSION_3) { if (mcasp->version < MCASP_VERSION_3) {
mcasp->fifo_base = DAVINCI_MCASP_V2_AFIFO_BASE; mcasp->fifo_base = DAVINCI_MCASP_V2_AFIFO_BASE;
/* dma_data->dma_addr is pointing to the data port address */ /* dma_params->dma_addr is pointing to the data port address */
mcasp->dat_port = true; mcasp->dat_port = true;
} else { } else {
mcasp->fifo_base = DAVINCI_MCASP_V3_AFIFO_BASE; mcasp->fifo_base = DAVINCI_MCASP_V3_AFIFO_BASE;
...@@ -1136,9 +1136,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ...@@ -1136,9 +1136,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 1); res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (res) if (res)
dma_data->channel = res->start; dma_params->channel = res->start;
else else
dma_data->channel = pdata->rx_dma_channel; dma_params->channel = pdata->rx_dma_channel;
/* Unconditional dmaengine stuff */ /* Unconditional dmaengine stuff */
mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].filter_data = "tx"; mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].filter_data = "tx";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment