diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-09-14 15:05:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 11:13:02 -0400 |
| commit | bcd6da7bfd1bc3e9d5f8887967ec3d550ce56c70 (patch) | |
| tree | 185bd9cd57ba3dbf3e223fe83e6bbd1a7ed8a92f /sound/soc/omap/omap-dmic.c | |
| parent | f05cc9dac99ac6403d057d2cccb3c754714d2f32 (diff) | |
| download | linux-bcd6da7bfd1bc3e9d5f8887967ec3d550ce56c70.tar.gz linux-bcd6da7bfd1bc3e9d5f8887967ec3d550ce56c70.tar.bz2 linux-bcd6da7bfd1bc3e9d5f8887967ec3d550ce56c70.zip | |
ASoC: OMAP: mcbsp, mcpdm, dmic, hdmi: Set dma_data at startup time
Set the dma_data for the stream (snd_soc_dai_set_dma_data) at dai_startup
time so omap-pcm will have access to the needed information regarding to
the DMA channel earlier.
This is needed for the clean dmaengine support.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap-dmic.c')
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index df0ff247f496..68f2cd1a9206 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -118,6 +118,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream, mutex_unlock(&dmic->mutex); + snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params); return ret; } @@ -202,6 +203,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); + struct omap_pcm_dma_data *dma_data; int channels; dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params)); @@ -227,8 +229,8 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream, } /* packet size is threshold * channels */ - omap_dmic_dai_dma_params.packet_size = dmic->threshold * channels; - snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params); + dma_data = snd_soc_dai_get_dma_data(dai, substream); + dma_data->packet_size = dmic->threshold * channels; return 0; } |