diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 04:54:18 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-30 04:54:18 +0200 |
commit | d21685ec258f803d3badae5eae821383a34815a9 (patch) | |
tree | 7ab60a2a5d557a4f345b01a79ca2f877c06d9b92 /sound/soc/davinci | |
parent | ASoC: Remove redundant freq assignment for max98095->sysclk/max98088->sysclk (diff) | |
parent | ASoC: Fix wm_hubs input PGA ZC bits (diff) | |
download | linux-d21685ec258f803d3badae5eae821383a34815a9.tar.xz linux-d21685ec258f803d3badae5eae821383a34815a9.zip |
Merge branch 'for-2.6.40' into for-2.6.41
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 4ddc6d3b6678..8566238db2a5 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -909,6 +909,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]; dma_data->asp_chan_q = pdata->asp_chan_q; dma_data->ram_chan_q = pdata->ram_chan_q; + dma_data->sram_size = pdata->sram_size_playback; dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset + mem->start); @@ -925,6 +926,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]; dma_data->asp_chan_q = pdata->asp_chan_q; dma_data->ram_chan_q = pdata->ram_chan_q; + dma_data->sram_size = pdata->sram_size_capture; dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset + mem->start); |