summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-31 11:51:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-02 14:04:24 +0100
commit57296cc28cf8aab2e5e63d8f9964718ae29cc229 (patch)
treef0763342f24f3c959c85dc754fc87ae0363d21ac /sound/soc
parentASoC: zoom2: No need to configure the Voice port anymore (diff)
downloadlinux-57296cc28cf8aab2e5e63d8f9964718ae29cc229.tar.xz
linux-57296cc28cf8aab2e5e63d8f9964718ae29cc229.zip
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')
-rw-r--r--sound/soc/omap/sdp3430.c15
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)
return ret;
}
-static int sdp3430_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd)
-{
- struct snd_soc_codec *codec = rtd->codec;
- unsigned short reg;
-
- /* Enable voice interface */
- reg = codec->driver->read(codec, TWL4030_REG_VOICE_IF);
- reg |= TWL4030_VIF_DIN_EN | TWL4030_VIF_DOUT_EN | TWL4030_VIF_EN;
- codec->driver->write(codec, TWL4030_REG_VOICE_IF, reg);
-
- return 0;
-}
-
-
/* Digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link sdp3430_dai[] = {
{
@@ -204,7 +190,6 @@ static struct snd_soc_dai_link sdp3430_dai[] = {
.codec_name = "twl4030-codec",
.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBM_CFM,
- .init = sdp3430_twl4030_voice_init,
.ops = &sdp3430_ops,
},
};