]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: sdp3430: No need to configure the Voice port anymore
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 31 Dec 2012 10:51:44 +0000 (11:51 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 2 Jan 2013 13:04:24 +0000 (13:04 +0000)
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>
sound/soc/omap/sdp3430.c

index b462a2c9385f04e5ade66cc2b38fa427a6b668cc..86e77e9d24c6877894e77a5e97a50d892d90fd02 100644 (file)
@@ -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,
        },
 };