leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: TWL4030: Add voice digital loopback: sidetone

Browse Source 
This patch add voice digital loopback (sidetone) to the twl4030
driver. It mixes voice uplink attenuated (by sidetone gain) with
voice downlink when the codec is working in option2 (voice/audio
mode).

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lopez Cruz, Misael 2009-04-30 21:48:08 -05:00 committed by Mark Brown
parent fcd274a345
commit ee8f6894f3
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/codecs/twl4030.c
View File

@ -491,6 +491,18 @@ static const struct snd_kcontrol_new twl4030_dapm_dbypassr_control =
TWL4030_REG_ATX2ARXPGA, 0, 7, 0, TWL4030_REG_ATX2ARXPGA, 0, 7, 0,
twl4030_dapm_dbypass_tlv); twl4030_dapm_dbypass_tlv);
/*
* Voice Sidetone GAIN volume control:
* from -51 to -10 dB in 1 dB steps (mute instead of -51 dB)
*/
static DECLARE_TLV_DB_SCALE(twl4030_dapm_dbypassv_tlv, -5100, 100, 1);
/* Digital bypass voice: sidetone (VUL -> VDL)*/
static const struct snd_kcontrol_new twl4030_dapm_dbypassv_control =
SOC_DAPM_SINGLE_TLV("Volume",
TWL4030_REG_VSTPGA, 0, 0x29, 0,
twl4030_dapm_dbypassv_tlv);
static int micpath_event(struct snd_soc_dapm_widget *w, static int micpath_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
@ -607,12 +619,18 @@ static int bypass_event(struct snd_soc_dapm_widget *w,
twl4030->bypass_state |= (1 << 4); twl4030->bypass_state |= (1 << 4);
else else
twl4030->bypass_state &= ~(1 << 4); twl4030->bypass_state &= ~(1 << 4);
} else if (m->reg == TWL4030_REG_VSTPGA) {
/* Voice digital bypass */
if (reg)
twl4030->bypass_state |= (1 << 5);
else
twl4030->bypass_state &= ~(1 << 5);
} else { } else {
/* Digital bypass */ /* Digital bypass */
if (reg & (0x7 << m->shift)) if (reg & (0x7 << m->shift))
twl4030->bypass_state |= (1 << (m->shift ? 6 : 5)); twl4030->bypass_state |= (1 << (m->shift ? 7 : 6));
else else
twl4030->bypass_state &= ~(1 << (m->shift ? 6 : 5)); twl4030->bypass_state &= ~(1 << (m->shift ? 7 : 6));
} }
/* Enable master analog loopback mode if any analog switch is enabled*/ /* Enable master analog loopback mode if any analog switch is enabled*/
@ -991,6 +1009,9 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
SND_SOC_DAPM_SWITCH_E("Right Digital Loopback", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_SWITCH_E("Right Digital Loopback", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_dbypassr_control, bypass_event, &twl4030_dapm_dbypassr_control, bypass_event,
SND_SOC_DAPM_POST_REG), SND_SOC_DAPM_POST_REG),
SND_SOC_DAPM_SWITCH_E("Voice Digital Loopback", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_dbypassv_control, bypass_event,
SND_SOC_DAPM_POST_REG),
SND_SOC_DAPM_MIXER("Analog R1 Playback Mixer", TWL4030_REG_AVDAC_CTL, SND_SOC_DAPM_MIXER("Analog R1 Playback Mixer", TWL4030_REG_AVDAC_CTL,
0, 0, NULL, 0), 0, 0, NULL, 0),
@ -1203,9 +1224,11 @@ static const struct snd_soc_dapm_route intercon[] = {
/* Digital bypass routes */ /* Digital bypass routes */
{"Right Digital Loopback", "Volume", "TX1 Capture Route"}, {"Right Digital Loopback", "Volume", "TX1 Capture Route"},
{"Left Digital Loopback", "Volume", "TX1 Capture Route"}, {"Left Digital Loopback", "Volume", "TX1 Capture Route"},
{"Voice Digital Loopback", "Volume", "TX2 Capture Route"},
{"Analog R2 Playback Mixer", NULL, "Right Digital Loopback"}, {"Analog R2 Playback Mixer", NULL, "Right Digital Loopback"},
{"Analog L2 Playback Mixer", NULL, "Left Digital Loopback"}, {"Analog L2 Playback Mixer", NULL, "Left Digital Loopback"},
{"Analog Voice Playback Mixer", NULL, "Voice Digital Loopback"},
}; };