diff options
Diffstat (limited to 'sound/soc/pxa/pxa2xx-i2s.c')
-rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 83b59d7fe96..e6c24408c5f 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -304,6 +304,15 @@ static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) | |||
304 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ | 304 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ |
305 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) | 305 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) |
306 | 306 | ||
307 | static struct snd_soc_dai_ops pxa_i2s_dai_ops = { | ||
308 | .startup = pxa2xx_i2s_startup, | ||
309 | .shutdown = pxa2xx_i2s_shutdown, | ||
310 | .trigger = pxa2xx_i2s_trigger, | ||
311 | .hw_params = pxa2xx_i2s_hw_params, | ||
312 | .set_fmt = pxa2xx_i2s_set_dai_fmt, | ||
313 | .set_sysclk = pxa2xx_i2s_set_dai_sysclk, | ||
314 | }; | ||
315 | |||
307 | struct snd_soc_dai pxa_i2s_dai = { | 316 | struct snd_soc_dai pxa_i2s_dai = { |
308 | .name = "pxa2xx-i2s", | 317 | .name = "pxa2xx-i2s", |
309 | .id = 0, | 318 | .id = 0, |
@@ -319,14 +328,7 @@ struct snd_soc_dai pxa_i2s_dai = { | |||
319 | .channels_max = 2, | 328 | .channels_max = 2, |
320 | .rates = PXA2XX_I2S_RATES, | 329 | .rates = PXA2XX_I2S_RATES, |
321 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, | 330 | .formats = SNDRV_PCM_FMTBIT_S16_LE,}, |
322 | .ops = { | 331 | .ops = &pxa_i2s_dai_ops, |
323 | .startup = pxa2xx_i2s_startup, | ||
324 | .shutdown = pxa2xx_i2s_shutdown, | ||
325 | .trigger = pxa2xx_i2s_trigger, | ||
326 | .hw_params = pxa2xx_i2s_hw_params, | ||
327 | .set_fmt = pxa2xx_i2s_set_dai_fmt, | ||
328 | .set_sysclk = pxa2xx_i2s_set_dai_sysclk, | ||
329 | }, | ||
330 | }; | 332 | }; |
331 | 333 | ||
332 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); | 334 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); |