Message ID | f28f86fbe10a8cafeb04b4066b781efb7b3913b8.1305723716.git.bengardiner@nanometrics.ca (mailing list archive) |
---|---|
State | Awaiting Upstream |
Headers | show |
On Wed, May 18, 2011 at 09:27:45AM -0400, Ben Gardiner wrote: > The davinci-i2s driver copies the platform data for playback and capture > sram sizes which is in turn used by davinci-pcm to allocate ping-pong > buffers. > > Copy also the platform data in davinci-mcasp probe. > > Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Applied, thanks.
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 4ddc6d3..8566238 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);
The davinci-i2s driver copies the platform data for playback and capture sram sizes which is in turn used by davinci-pcm to allocate ping-pong buffers. Copy also the platform data in davinci-mcasp probe. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> --- sound/soc/davinci/davinci-mcasp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)