diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-31 05:51:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-02 08:04:24 -0500 |
commit | 57296cc28cf8aab2e5e63d8f9964718ae29cc229 (patch) | |
tree | f0763342f24f3c959c85dc754fc87ae0363d21ac /sound/soc/omap | |
parent | 01df26edaf4d15e1af3300f8a52b11d3f06c5096 (diff) |
ASoC: sdp3430: No need to configure the Voice port anymore
The codec driver takes care of these bits.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/sdp3430.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index b462a2c9385f..86e77e9d24c6 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -167,20 +167,6 @@ static int sdp3430_twl4030_init(struct snd_soc_pcm_runtime *rtd) | |||
167 | return ret; | 167 | return ret; |
168 | } | 168 | } |
169 | 169 | ||
170 | static int sdp3430_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd) | ||
171 | { | ||
172 | struct snd_soc_codec *codec = rtd->codec; | ||
173 | unsigned short reg; | ||
174 | |||
175 | /* Enable voice interface */ | ||
176 | reg = codec->driver->read(codec, TWL4030_REG_VOICE_IF); | ||
177 | reg |= TWL4030_VIF_DIN_EN | TWL4030_VIF_DOUT_EN | TWL4030_VIF_EN; | ||
178 | codec->driver->write(codec, TWL4030_REG_VOICE_IF, reg); | ||
179 | |||
180 | return 0; | ||
181 | } | ||
182 | |||
183 | |||
184 | /* Digital audio interface glue - connects codec <--> CPU */ | 170 | /* Digital audio interface glue - connects codec <--> CPU */ |
185 | static struct snd_soc_dai_link sdp3430_dai[] = { | 171 | static struct snd_soc_dai_link sdp3430_dai[] = { |
186 | { | 172 | { |
@@ -204,7 +190,6 @@ static struct snd_soc_dai_link sdp3430_dai[] = { | |||
204 | .codec_name = "twl4030-codec", | 190 | .codec_name = "twl4030-codec", |
205 | .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | | 191 | .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | |
206 | SND_SOC_DAIFMT_CBM_CFM, | 192 | SND_SOC_DAIFMT_CBM_CFM, |
207 | .init = sdp3430_twl4030_voice_init, | ||
208 | .ops = &sdp3430_ops, | 193 | .ops = &sdp3430_ops, |
209 | }, | 194 | }, |
210 | }; | 195 | }; |