Skip to contentSkip to conversation

wm9712 mono mixer

PATCH Applied Marek Vasut 3 participants 3 messages Jul 18, 2008 – Jul 20, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wm9712 mono mixer

Hi,
this fixes typo in wm9712 codec which prevents it from registering all audio routes (and thus working correctly). Please consider applying.

(Tested and works on palmtx, palmld and palmt5)

sound/soc/codecs/wm9712.c +5 -5
index 9fc8edd..1fb7f9a 100644
@@ -427,20 +427,20 @@ static const struct snd_soc_dapm_route audio_map[] = {
 	{"HPOUTR", NULL, "Headphone PGA"},
 	{"Headphone PGA", NULL, "Right HP Mixer"},
 
-	/* mono hp mixer */
-	{"Mono HP Mixer", NULL, "Left HP Mixer"},
-	{"Mono HP Mixer", NULL, "Right HP Mixer"},
+	/* mono mixer */
+	{"Mono Mixer", NULL, "Left HP Mixer"},
+	{"Mono Mixer", NULL, "Right HP Mixer"},
 
 	/* Out3 Mux */
 	{"Out3 Mux", "Left", "Left HP Mixer"},
 	{"Out3 Mux", "Mono", "Phone Mixer"},
-	{"Out3 Mux", "Left + Right", "Mono HP Mixer"},
+	{"Out3 Mux", "Left + Right", "Mono Mixer"},
 	{"Out 3 PGA", NULL, "Out3 Mux"},
 	{"OUT3", NULL, "Out 3 PGA"},
 
 	/* speaker Mux */
 	{"Speaker Mux", "Speaker Mix", "Speaker Mixer"},
-	{"Speaker Mux", "Headphone Mix", "Mono HP Mixer"},
+	{"Speaker Mux", "Headphone Mix", "Mono Mixer"},
 	{"Speaker PGA", NULL, "Speaker Mux"},
 	{"LOUT2", NULL, "Speaker PGA"},
 	{"ROUT2", NULL, "Speaker PGA"},

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Marek Vasut

this fixes typo in wm9712 codec which prevents it from registering all audio routes (and thus working correctly). Please consider applying.

(Tested and works on palmtx, palmld and palmt5)

Looks right - thanks!

BTW, when submitting patches it is more normal to include the patch in the body of the e-mail rather than as an attachment. It can make things a bit more natural for automated tools for handling patches submitted via e-mail. See Documentation/email-clients.txt for some instructions for setting up some e-mail clients to support this. If you are doing attachments it can be helpful to include the commit message in the patch file in case the file gets separated from the e-mail.

Applied
#2 lore raw

At Sat, 19 Jul 2008 10:22:21 +0100,

Quoted 11 lines · Mark Brown
Quoted 4 lines · Marek Vasut

this fixes typo in wm9712 codec which prevents it from registering all audio routes (and thus working correctly). Please consider applying.

(Tested and works on palmtx, palmld and palmt5)

Looks right - thanks!

Applied. Thanks.

Takashi