aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcbsp.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-09-14 08:05:51 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-22 11:12:58 -0400
commit061fb36db7c0187aa90b95f1ba56f6192f42b984 (patch)
tree5c6f148cec6de82edebd4111e8ba665c3754a7ad /sound/soc/omap/omap-mcbsp.c
parente512589c17572e7498693a3e05eefa44e622f62b (diff)
ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct
The omap-pcm platform driver no longer needs this parameter to select between ELEMENT and PACKET mode. The selection is based on the configured packet_size. 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-mcbsp.c')
-rw-r--r--sound/soc/omap/omap-mcbsp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index fe3debcc2d0b..5b3baccd74c3 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -225,7 +225,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
225 struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); 225 struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
226 struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs; 226 struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
227 struct omap_pcm_dma_data *dma_data; 227 struct omap_pcm_dma_data *dma_data;
228 int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT; 228 int wlen, channels, wpf;
229 int pkt_size = 0; 229 int pkt_size = 0;
230 unsigned int format, div, framesize, master; 230 unsigned int format, div, framesize, master;
231 231
@@ -272,15 +272,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
272 return -EINVAL; 272 return -EINVAL;
273 273
274 pkt_size = period_words / divider; 274 pkt_size = period_words / divider;
275 sync_mode = OMAP_DMA_SYNC_PACKET;
276 } else if (channels > 1) { 275 } else if (channels > 1) {
277 /* Use packet mode for non mono streams */ 276 /* Use packet mode for non mono streams */
278 pkt_size = channels; 277 pkt_size = channels;
279 sync_mode = OMAP_DMA_SYNC_PACKET;
280 } 278 }
281 } 279 }
282 280
283 dma_data->sync_mode = sync_mode;
284 dma_data->packet_size = pkt_size; 281 dma_data->packet_size = pkt_size;
285 282
286 snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data); 283 snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);