Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: twl6040: Support for AUX L/R output

Browse source 
AUX L/R outputs can be driver from the Handsfree PGA output.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2011-09-22 11:05:52 +03:00 • committed by Mark Brown
parent 45b0f60de2
commit fdb625ffd2
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/codecs/twl6040.c
View file

@ -997,6 +997,12 @@ static const struct snd_kcontrol_new hfr_mux_controls =
static const struct snd_kcontrol_new ep_path_enable_control = static const struct snd_kcontrol_new ep_path_enable_control =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_SW_SHADOW, 0, 1, 0); SOC_DAPM_SINGLE("Switch", TWL6040_REG_SW_SHADOW, 0, 1, 0);
static const struct snd_kcontrol_new auxl_switch_control =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 6, 1, 0);
static const struct snd_kcontrol_new auxr_switch_control =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFRCTL, 6, 1, 0);
/* Headset power mode */ /* Headset power mode */
static const char *twl6040_power_mode_texts[] = { static const char *twl6040_power_mode_texts[] = {
"Low-Power", "High-Perfomance", "Low-Power", "High-Perfomance",
@ -1105,6 +1111,8 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
SND_SOC_DAPM_OUTPUT("HFL"), SND_SOC_DAPM_OUTPUT("HFL"),
SND_SOC_DAPM_OUTPUT("HFR"), SND_SOC_DAPM_OUTPUT("HFR"),
SND_SOC_DAPM_OUTPUT("EP"), SND_SOC_DAPM_OUTPUT("EP"),
SND_SOC_DAPM_OUTPUT("AUXL"),
SND_SOC_DAPM_OUTPUT("AUXR"),
/* Analog input muxes for the capture amplifiers */ /* Analog input muxes for the capture amplifiers */
SND_SOC_DAPM_MUX("Analog Left Capture Route", SND_SOC_DAPM_MUX("Analog Left Capture Route",
@ -1170,6 +1178,10 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
SND_SOC_DAPM_SWITCH("Earphone Playback", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_SWITCH("Earphone Playback", SND_SOC_NOPM, 0, 0,
&ep_path_enable_control), &ep_path_enable_control),
SND_SOC_DAPM_SWITCH("AUXL Playback", SND_SOC_NOPM, 0, 0,
&auxl_switch_control),
SND_SOC_DAPM_SWITCH("AUXR Playback", SND_SOC_NOPM, 0, 0,
&auxr_switch_control),
/* Analog playback drivers */ /* Analog playback drivers */
SND_SOC_DAPM_OUT_DRV_E("HF Left Driver", SND_SOC_DAPM_OUT_DRV_E("HF Left Driver",
@ -1252,6 +1264,12 @@ static const struct snd_soc_dapm_route intercon[] = {
{"HFL", NULL, "HF Left Driver"}, {"HFL", NULL, "HF Left Driver"},
{"HFR", NULL, "HF Right Driver"}, {"HFR", NULL, "HF Right Driver"},
{"AUXL Playback", "Switch", "HF Left PGA"},
{"AUXR Playback", "Switch", "HF Right PGA"},
{"AUXL", NULL, "AUXL Playback"},
{"AUXR", NULL, "AUXR Playback"},
}; };
static int twl6040_add_widgets(struct snd_soc_codec *codec) static int twl6040_add_widgets(struct snd_soc_codec *codec)