summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMargarita Olaya Cabrera <magi.olaya@ti.com>2010-04-07 17:59:23 -0500
committerJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-06-17 18:26:57 -0500
commit289ffca5df32767b1e68c66785d491dc033c67eb (patch)
tree5e17833627d3acc092d9b73a7d2dd3ac913105e7 /sound
parentba5d58a07e3e9fdc2da489d2923cd94d3bde8e28 (diff)
ASoC: ABE-TWL6040: Initial mixer configuration
Multimedia and Tones on Handsfree, Voice on Headset path. Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com> Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/abe-twl6040.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/codecs/abe-twl6040.c b/sound/soc/codecs/abe-twl6040.c
index 5dc2a81455a6..676863eaccf3 100644
--- a/sound/soc/codecs/abe-twl6040.c
+++ b/sound/soc/codecs/abe-twl6040.c
@@ -282,6 +282,20 @@ static void abe_init_chip(struct snd_soc_codec *codec)
abe_set_opp_processing(OPP);
/* "tick" of the audio engine */
abe_write_event_generator(EVENT_TIMER);
+
+ abe_write_mixer(MIXDL1, MUTE_GAIN, RAMP_0MS, MIX_DL1_INPUT_MM_DL);
+ abe_write_mixer(MIXDL1, MUTE_GAIN, RAMP_0MS, MIX_DL1_INPUT_MM_UL2);
+ abe_write_mixer(MIXDL1, GAIN_M6dB, RAMP_0MS, MIX_DL1_INPUT_VX_DL);
+ abe_write_mixer(MIXDL1, MUTE_GAIN, RAMP_0MS, MIX_DL1_INPUT_TONES);
+
+ abe_write_mixer(MIXDL2, GAIN_M6dB, RAMP_0MS, MIX_DL2_INPUT_TONES);
+ abe_write_mixer(MIXDL2, MUTE_GAIN, RAMP_0MS, MIX_DL2_INPUT_VX_DL);
+ abe_write_mixer(MIXDL2, GAIN_M6dB, RAMP_0MS, MIX_DL2_INPUT_MM_DL);
+ abe_write_mixer(MIXDL2, MUTE_GAIN, RAMP_0MS, MIX_DL2_INPUT_MM_UL2);
+
+ /* Vx in HS, MM in HF and Tones in HF */
+ twl6040_write(codec, TWL6040_REG_SHADOW, 0x92);
+
clk_disable(priv->clk);
}