aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-31 05:51:43 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-02 08:04:24 -0500
commit01df26edaf4d15e1af3300f8a52b11d3f06c5096 (patch)
tree59fc63ff361df064b9302d04243ceea4ff4d0132 /sound/soc/omap
parent927a77476ed37080793f0e9d3211359f2d480d4d (diff)
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>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/zoom2.c14
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)
110 return 0; 110 return 0;
111} 111}
112 112
113static int zoom2_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd)
114{
115 struct snd_soc_codec *codec = rtd->codec;
116 unsigned short reg;
117
118 /* Enable voice interface */
119 reg = codec->driver->read(codec, TWL4030_REG_VOICE_IF);
120 reg |= TWL4030_VIF_DIN_EN | TWL4030_VIF_DOUT_EN | TWL4030_VIF_EN;
121 codec->driver->write(codec, TWL4030_REG_VOICE_IF, reg);
122
123 return 0;
124}
125
126/* Digital audio interface glue - connects codec <--> CPU */ 113/* Digital audio interface glue - connects codec <--> CPU */
127static struct snd_soc_dai_link zoom2_dai[] = { 114static struct snd_soc_dai_link zoom2_dai[] = {
128 { 115 {
@@ -146,7 +133,6 @@ static struct snd_soc_dai_link zoom2_dai[] = {
146 .codec_name = "twl4030-codec", 133 .codec_name = "twl4030-codec",
147 .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | 134 .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
148 SND_SOC_DAIFMT_CBM_CFM, 135 SND_SOC_DAIFMT_CBM_CFM,
149 .init = zoom2_twl4030_voice_init,
150 .ops = &zoom2_ops, 136 .ops = &zoom2_ops,
151 }, 137 },
152}; 138};