diff options
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994pcm.c')
-rw-r--r-- | sound/soc/samsung/smdk_wm8994pcm.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c index c470e8eed6e1..b1c89ec2d999 100644 --- a/sound/soc/samsung/smdk_wm8994pcm.c +++ b/sound/soc/samsung/smdk_wm8994pcm.c | |||
@@ -68,20 +68,6 @@ static int smdk_wm8994_pcm_hw_params(struct snd_pcm_substream *substream, | |||
68 | 68 | ||
69 | mclk_freq = params_rate(params) * rfs; | 69 | mclk_freq = params_rate(params) * rfs; |
70 | 70 | ||
71 | /* Set the codec DAI configuration */ | ||
72 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | ||
73 | | SND_SOC_DAIFMT_IB_NF | ||
74 | | SND_SOC_DAIFMT_CBS_CFS); | ||
75 | if (ret < 0) | ||
76 | return ret; | ||
77 | |||
78 | /* Set the cpu DAI configuration */ | ||
79 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B | ||
80 | | SND_SOC_DAIFMT_IB_NF | ||
81 | | SND_SOC_DAIFMT_CBS_CFS); | ||
82 | if (ret < 0) | ||
83 | return ret; | ||
84 | |||
85 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_FLL1, | 71 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_FLL1, |
86 | mclk_freq, SND_SOC_CLOCK_IN); | 72 | mclk_freq, SND_SOC_CLOCK_IN); |
87 | if (ret < 0) | 73 | if (ret < 0) |
@@ -118,6 +104,8 @@ static struct snd_soc_dai_link smdk_dai[] = { | |||
118 | .codec_dai_name = "wm8994-aif1", | 104 | .codec_dai_name = "wm8994-aif1", |
119 | .platform_name = "samsung-pcm.0", | 105 | .platform_name = "samsung-pcm.0", |
120 | .codec_name = "wm8994-codec", | 106 | .codec_name = "wm8994-codec", |
107 | .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | | ||
108 | SND_SOC_DAIFMT_CBS_CFS, | ||
121 | .ops = &smdk_wm8994_pcm_ops, | 109 | .ops = &smdk_wm8994_pcm_ops, |
122 | }, | 110 | }, |
123 | }; | 111 | }; |