aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/davinci/davinci-mcasp.c
diff options
context:
space:
mode:
authorMatt Porter <mporter@ti.com>2012-10-17 10:08:03 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-22 09:58:34 -0400
commitb8ec56d8eabc6382bd6586024138d9f1d1121ceb (patch)
tree75392080a456dfe65b26e9e9bc9a8d20db9a1b16 /sound/soc/davinci/davinci-mcasp.c
parent6b7fa011571d10309cd2b39511f895cef9dd536c (diff)
ASoC: davinci: replace private sram api with genalloc
Removes the DaVinci private SRAM API and replaces it with the genalloc API. The SRAM gen_pool is passed in pdata since DaVinci is in the early stages of DT conversion. [zonque@gmail.com: stub out gen_pool functions for !CONFIG_GENERIC_ALLOCATOR] Signed-off-by: Matt Porter <mporter@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-mcasp.c')
-rw-r--r--sound/soc/davinci/davinci-mcasp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 4fd149bb1ae7..571559501b0b 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1167,6 +1167,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
1167 dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]; 1167 dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK];
1168 dma_data->asp_chan_q = pdata->asp_chan_q; 1168 dma_data->asp_chan_q = pdata->asp_chan_q;
1169 dma_data->ram_chan_q = pdata->ram_chan_q; 1169 dma_data->ram_chan_q = pdata->ram_chan_q;
1170 dma_data->sram_pool = pdata->sram_pool;
1170 dma_data->sram_size = pdata->sram_size_playback; 1171 dma_data->sram_size = pdata->sram_size_playback;
1171 dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset + 1172 dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset +
1172 mem->start); 1173 mem->start);
@@ -1184,6 +1185,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
1184 dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]; 1185 dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE];
1185 dma_data->asp_chan_q = pdata->asp_chan_q; 1186 dma_data->asp_chan_q = pdata->asp_chan_q;
1186 dma_data->ram_chan_q = pdata->ram_chan_q; 1187 dma_data->ram_chan_q = pdata->ram_chan_q;
1188 dma_data->sram_pool = pdata->sram_pool;
1187 dma_data->sram_size = pdata->sram_size_capture; 1189 dma_data->sram_size = pdata->sram_size_capture;
1188 dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset + 1190 dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset +
1189 mem->start); 1191 mem->start);