Skip to content
Snippets Groups Projects
Commit d48e95a1 authored by Alessandro Pecugi's avatar Alessandro Pecugi Committed by Gianfranco Mariotti
Browse files

[DRIVER][TLV320] add missing dapm controls and routes

Add the "MAL Switch" and "MAR Switch" dapm controls to the LOL/LOR output
mixers, and setup their routing. This allows to connect the mixer amplifiers
to the Line Out outputs. Previously, the mixer amps could only be connected
to the headphone output.

Also add the "LOR Switch" control to LOL, to enable redirecting LOR output
to LOL (necessary to route differential mono input from IN1 to both LOL and
LOR).
parent 56116d24
No related branches found
No related tags found
No related merge requests found
......@@ -340,10 +340,13 @@ static const struct snd_kcontrol_new hpr_output_mixer_controls[] = {
static const struct snd_kcontrol_new lol_output_mixer_controls[] = {
SOC_DAPM_SINGLE("L_DAC Switch", AIC32X4_LOLROUTE, 3, 1, 0),
SOC_DAPM_SINGLE("MAL Switch", AIC32X4_LOLROUTE, 1, 1, 0),
SOC_DAPM_SINGLE("LOR Switch", AIC32X4_LOLROUTE, 0, 1, 0),
};
static const struct snd_kcontrol_new lor_output_mixer_controls[] = {
SOC_DAPM_SINGLE("R_DAC Switch", AIC32X4_LORROUTE, 3, 1, 0),
SOC_DAPM_SINGLE("MAR Switch", AIC32X4_LORROUTE, 1, 1, 0),
};
static const char * const resistor_text[] = {
......@@ -515,9 +518,12 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
{"HPL", NULL, "HPL Power"},
{"MAL Power", NULL, "HPL Output Mixer"},
{"MAL Power", NULL, "LOL Output Mixer"},
{"MAL", NULL, "MAL Power"},
{"LOL Output Mixer", "L_DAC Switch", "Left DAC"},
{"LOL Output Mixer", "MAL Switch", "MAL"},
{"LOL Output Mixer", "LOR Switch", "LOR"},
{"LOL Power", NULL, "LOL Output Mixer"},
{"LOL", NULL, "LOL Power"},
......@@ -531,9 +537,11 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
{"HPR", NULL, "HPR Power"},
{"MAR Power", NULL, "HPR Output Mixer"},
{"MAR Power", NULL, "LOR Output Mixer"},
{"MAR", NULL, "MAR Power"},
{"LOR Output Mixer", "R_DAC Switch", "Right DAC"},
{"LOR Output Mixer", "MAR Switch", "MAR"},
{"LOR Power", NULL, "LOR Output Mixer"},
{"LOR", NULL, "LOR Power"},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment