diff options
Diffstat (limited to 'sound/soc/davinci/davinci-i2s.c')
-rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index 95df51e803b4..7a17cd0ecf64 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c | |||
@@ -188,7 +188,8 @@ static void davinci_mcbsp_stop(struct snd_pcm_substream *substream) | |||
188 | davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, w); | 188 | davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, w); |
189 | } | 189 | } |
190 | 190 | ||
191 | static int davinci_i2s_startup(struct snd_pcm_substream *substream) | 191 | static int davinci_i2s_startup(struct snd_pcm_substream *substream, |
192 | struct snd_soc_dai *dai) | ||
192 | { | 193 | { |
193 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 194 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
194 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 195 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; |
@@ -285,7 +286,8 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, | |||
285 | } | 286 | } |
286 | 287 | ||
287 | static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, | 288 | static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, |
288 | struct snd_pcm_hw_params *params) | 289 | struct snd_pcm_hw_params *params, |
290 | struct snd_soc_dai *dai) | ||
289 | { | 291 | { |
290 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 292 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
291 | struct davinci_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; | 293 | struct davinci_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data; |
@@ -349,7 +351,8 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream, | |||
349 | return 0; | 351 | return 0; |
350 | } | 352 | } |
351 | 353 | ||
352 | static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd) | 354 | static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd, |
355 | struct snd_soc_dai *dai) | ||
353 | { | 356 | { |
354 | int ret = 0; | 357 | int ret = 0; |
355 | 358 | ||
@@ -473,8 +476,7 @@ struct snd_soc_dai davinci_i2s_dai = { | |||
473 | .ops = { | 476 | .ops = { |
474 | .startup = davinci_i2s_startup, | 477 | .startup = davinci_i2s_startup, |
475 | .trigger = davinci_i2s_trigger, | 478 | .trigger = davinci_i2s_trigger, |
476 | .hw_params = davinci_i2s_hw_params,}, | 479 | .hw_params = davinci_i2s_hw_params, |
477 | .dai_ops = { | ||
478 | .set_fmt = davinci_i2s_set_dai_fmt, | 480 | .set_fmt = davinci_i2s_set_dai_fmt, |
479 | }, | 481 | }, |
480 | }; | 482 | }; |