Skip to content

L
linux
Commit 591d8a25 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'asoc-fixes' into for-linus

parents 030b655b 4037314a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sound/soc/codecs/wm8753.c
View file @ 591d8a25
...@@ -583,7 +583,7 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -583,7 +583,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* out 4 */ /* out 4 */
{"Out4 Mux", "VREF", "VREF"}, {"Out4 Mux", "VREF", "VREF"},
{"Out4 Mux", "Capture ST", "Capture ST Mixer"}, {"Out4 Mux", "Capture ST", "Playback Mixer"},
{"Out4 Mux", "LOUT2", "LOUT2"}, {"Out4 Mux", "LOUT2", "LOUT2"},
{"Out 4", NULL, "Out4 Mux"}, {"Out 4", NULL, "Out4 Mux"},
{"OUT4", NULL, "Out 4"}, {"OUT4", NULL, "Out 4"},
...@@ -607,7 +607,7 @@ static const struct snd_soc_dapm_route audio_map[] = { ...@@ -607,7 +607,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* Capture Right Mux */ /* Capture Right Mux */
{"Capture Right Mux", "PGA", "Right Capture Volume"}, {"Capture Right Mux", "PGA", "Right Capture Volume"},
{"Capture Right Mux", "Line or RXP-RXN", "Line Right Mux"}, {"Capture Right Mux", "Line or RXP-RXN", "Line Right Mux"},
{"Capture Right Mux", "Sidetone", "Capture ST Mixer"}, {"Capture Right Mux", "Sidetone", "Playback Mixer"},
/* Mono Capture mixer-mux */ /* Mono Capture mixer-mux */
{"Capture Right Mixer", "Stereo", "Capture Right Mux"}, {"Capture Right Mixer", "Stereo", "Capture Right Mux"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7