aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/at91/at91-ssc.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/at91/at91-ssc.c')
-rw-r--r--sound/soc/at91/at91-ssc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c
index bc35d00a38f8..c3625b665c5a 100644
--- a/sound/soc/at91/at91-ssc.c
+++ b/sound/soc/at91/at91-ssc.c
@@ -281,7 +281,7 @@ static void at91_ssc_shutdown(struct snd_pcm_substream *substream)
281/* 281/*
282 * Record the SSC system clock rate. 282 * Record the SSC system clock rate.
283 */ 283 */
284static int at91_ssc_set_dai_sysclk(struct snd_soc_cpu_dai *cpu_dai, 284static int at91_ssc_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
285 int clk_id, unsigned int freq, int dir) 285 int clk_id, unsigned int freq, int dir)
286{ 286{
287 /* 287 /*
@@ -303,7 +303,7 @@ static int at91_ssc_set_dai_sysclk(struct snd_soc_cpu_dai *cpu_dai,
303/* 303/*
304 * Record the DAI format for use in hw_params(). 304 * Record the DAI format for use in hw_params().
305 */ 305 */
306static int at91_ssc_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai, 306static int at91_ssc_set_dai_fmt(struct snd_soc_dai *cpu_dai,
307 unsigned int fmt) 307 unsigned int fmt)
308{ 308{
309 struct at91_ssc_info *ssc_p = &ssc_info[cpu_dai->id]; 309 struct at91_ssc_info *ssc_p = &ssc_info[cpu_dai->id];
@@ -315,7 +315,7 @@ static int at91_ssc_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai,
315/* 315/*
316 * Record SSC clock dividers for use in hw_params(). 316 * Record SSC clock dividers for use in hw_params().
317 */ 317 */
318static int at91_ssc_set_dai_clkdiv(struct snd_soc_cpu_dai *cpu_dai, 318static int at91_ssc_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
319 int div_id, int div) 319 int div_id, int div)
320{ 320{
321 struct at91_ssc_info *ssc_p = &ssc_info[cpu_dai->id]; 321 struct at91_ssc_info *ssc_p = &ssc_info[cpu_dai->id];
@@ -634,7 +634,7 @@ static int at91_ssc_prepare(struct snd_pcm_substream *substream)
634 634
635#ifdef CONFIG_PM 635#ifdef CONFIG_PM
636static int at91_ssc_suspend(struct platform_device *pdev, 636static int at91_ssc_suspend(struct platform_device *pdev,
637 struct snd_soc_cpu_dai *cpu_dai) 637 struct snd_soc_dai *cpu_dai)
638{ 638{
639 struct at91_ssc_info *ssc_p; 639 struct at91_ssc_info *ssc_p;
640 640
@@ -662,7 +662,7 @@ static int at91_ssc_suspend(struct platform_device *pdev,
662} 662}
663 663
664static int at91_ssc_resume(struct platform_device *pdev, 664static int at91_ssc_resume(struct platform_device *pdev,
665 struct snd_soc_cpu_dai *cpu_dai) 665 struct snd_soc_dai *cpu_dai)
666{ 666{
667 struct at91_ssc_info *ssc_p; 667 struct at91_ssc_info *ssc_p;
668 668
@@ -700,7 +700,7 @@ static int at91_ssc_resume(struct platform_device *pdev,
700#define AT91_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\ 700#define AT91_SSC_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
701 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) 701 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
702 702
703struct snd_soc_cpu_dai at91_ssc_dai[NUM_SSC_DEVICES] = { 703struct snd_soc_dai at91_ssc_dai[NUM_SSC_DEVICES] = {
704 { .name = "at91-ssc0", 704 { .name = "at91-ssc0",
705 .id = 0, 705 .id = 0,
706 .type = SND_SOC_DAI_PCM, 706 .type = SND_SOC_DAI_PCM,