diff options
Diffstat (limited to 'sound/soc/samsung/h1940_uda1380.c')
-rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index f2d7980d7ddc..59b044255b78 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
@@ -76,7 +76,6 @@ static int h1940_hw_params(struct snd_pcm_substream *substream, | |||
76 | { | 76 | { |
77 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 77 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
78 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 78 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
79 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | ||
80 | int div; | 79 | int div; |
81 | int ret; | 80 | int ret; |
82 | unsigned int rate = params_rate(params); | 81 | unsigned int rate = params_rate(params); |
@@ -95,18 +94,6 @@ static int h1940_hw_params(struct snd_pcm_substream *substream, | |||
95 | return -EINVAL; | 94 | return -EINVAL; |
96 | } | 95 | } |
97 | 96 | ||
98 | /* set codec DAI configuration */ | ||
99 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
100 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
101 | if (ret < 0) | ||
102 | return ret; | ||
103 | |||
104 | /* set cpu DAI configuration */ | ||
105 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
106 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
107 | if (ret < 0) | ||
108 | return ret; | ||
109 | |||
110 | /* select clock source */ | 97 | /* select clock source */ |
111 | ret = snd_soc_dai_set_sysclk(cpu_dai, S3C24XX_CLKSRC_PCLK, rate, | 98 | ret = snd_soc_dai_set_sysclk(cpu_dai, S3C24XX_CLKSRC_PCLK, rate, |
112 | SND_SOC_CLOCK_OUT); | 99 | SND_SOC_CLOCK_OUT); |
@@ -207,6 +194,8 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = { | |||
207 | .init = h1940_uda1380_init, | 194 | .init = h1940_uda1380_init, |
208 | .platform_name = "s3c24xx-iis", | 195 | .platform_name = "s3c24xx-iis", |
209 | .codec_name = "uda1380-codec.0-001a", | 196 | .codec_name = "uda1380-codec.0-001a", |
197 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
198 | SND_SOC_DAIFMT_CBS_CFS, | ||
210 | .ops = &h1940_ops, | 199 | .ops = &h1940_ops, |
211 | }, | 200 | }, |
212 | }; | 201 | }; |