diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-31 11:51:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-02 13:04:24 +0000 |
| commit | 01df26edaf4d15e1af3300f8a52b11d3f06c5096 (patch) | |
| tree | 59fc63ff361df064b9302d04243ceea4ff4d0132 | |
| parent | 927a77476ed37080793f0e9d3211359f2d480d4d (diff) | |
| download | blackbird-obmc-linux-01df26edaf4d15e1af3300f8a52b11d3f06c5096.tar.gz blackbird-obmc-linux-01df26edaf4d15e1af3300f8a52b11d3f06c5096.zip | |
ASoC: zoom2: 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>
| -rw-r--r-- | sound/soc/omap/zoom2.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 771bff27ac3e..5845d487d273 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -110,19 +110,6 @@ static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int zoom2_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 zoom2_dai[] = { { @@ -146,7 +133,6 @@ static struct snd_soc_dai_link zoom2_dai[] = { .codec_name = "twl4030-codec", .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM, - .init = zoom2_twl4030_voice_init, .ops = &zoom2_ops, }, }; |
