diff options
Diffstat (limited to 'sound/soc/samsung/smartq_wm8987.c')
-rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 9b0ffacab790..8291d2a5f152 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c | |||
@@ -56,20 +56,6 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream, | |||
56 | break; | 56 | break; |
57 | } | 57 | } |
58 | 58 | ||
59 | /* set codec DAI configuration */ | ||
60 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
61 | SND_SOC_DAIFMT_NB_NF | | ||
62 | SND_SOC_DAIFMT_CBS_CFS); | ||
63 | if (ret < 0) | ||
64 | return ret; | ||
65 | |||
66 | /* set cpu DAI configuration */ | ||
67 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
68 | SND_SOC_DAIFMT_NB_NF | | ||
69 | SND_SOC_DAIFMT_CBS_CFS); | ||
70 | if (ret < 0) | ||
71 | return ret; | ||
72 | |||
73 | /* Use PCLK for I2S signal generation */ | 59 | /* Use PCLK for I2S signal generation */ |
74 | ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0, | 60 | ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0, |
75 | 0, SND_SOC_CLOCK_IN); | 61 | 0, SND_SOC_CLOCK_IN); |
@@ -199,6 +185,8 @@ static struct snd_soc_dai_link smartq_dai[] = { | |||
199 | .platform_name = "samsung-i2s.0", | 185 | .platform_name = "samsung-i2s.0", |
200 | .codec_name = "wm8750.0-0x1a", | 186 | .codec_name = "wm8750.0-0x1a", |
201 | .init = smartq_wm8987_init, | 187 | .init = smartq_wm8987_init, |
188 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
189 | SND_SOC_DAIFMT_CBS_CFS, | ||
202 | .ops = &smartq_hifi_ops, | 190 | .ops = &smartq_hifi_ops, |
203 | }, | 191 | }, |
204 | }; | 192 | }; |