[PATCH] wm9712 mono mixer

[PATCH] wm9712 mono mixer

[Marek Vasut]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

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)

[-- Attachment #2: 01-wm9712-mixer-fix.patch --]
[-- Type: text/x-diff, Size: 1130 bytes --]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 9fc8edd..1fb7f9a 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -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"},

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] wm9712 mono mixer

[Mark Brown]

On Sat, Jul 19, 2008 at 12:51:25AM +0200, Marek Vasut wrote:

> 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!

Acked-by: Mark Brown <brooie@opensource.wolfsonmicro.com>

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.

Re: [PATCH] wm9712 mono mixer

[Takashi Iwai]

At Sat, 19 Jul 2008 10:22:21 +0100,
Mark Brown wrote:
> 
> On Sat, Jul 19, 2008 at 12:51:25AM +0200, Marek Vasut wrote:
> 
> > 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!
> 
> Acked-by: Mark Brown <brooie@opensource.wolfsonmicro.com>

Applied.  Thanks.


Takashi