Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'asoc-fixes' into for-linus

parents 030b655b 4037314a

sound/soc/codecs/wm8753.c

+2 −2
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 


	/* out 4 */

	{"Out4 Mux", "VREF", "VREF"},

	{"Out4 Mux", "Capture ST", "Capture ST Mixer"},

	{"Out4 Mux", "Capture ST", "Playback Mixer"},

	{"Out4 Mux", "LOUT2", "LOUT2"},

	{"Out 4", NULL, "Out4 Mux"},

	{"OUT4", NULL, "Out 4"},
@@ -607,7 +607,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	/* Capture Right Mux */

	{"Capture Right Mux", "PGA", "Right Capture Volume"},

	{"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 */

	{"Capture Right Mixer", "Stereo", "Capture Right Mux"},