Skip to contentSkip to conversation

soc/wm8731: Fix stereo mixer controls

PATCH Applied Ville Syrjälä 2 participants 2 messages Nov 25, 2007 – Nov 26, 2007

Subsystems (3)
Sound ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Ville Syrjälä

author
#0 lore raw

PATCH 1/1 soc/wm8731: Fix stereo mixer controls

soc/wm8731: Fix stereo mixer controls

Disable the simultaneous load feature for the line in and headphone out volume registers. This allows left and right volume levels to be controlled separately.

Signed-off-by Ville Syrjala <[email protected]>

---

sound/soc/codecs/wm8731.c +4 -4
index 7ca0b52..57fb95a 100644
@@ -562,13 +562,13 @@ static int wm8731_init(struct snd_soc_device *socdev)
 
 	/* set the update bits */
 	reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V);
-	wm8731_write(codec, WM8731_LOUT1V, reg | 0x0100);
+	wm8731_write(codec, WM8731_LOUT1V, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V);
-	wm8731_write(codec, WM8731_ROUT1V, reg | 0x0100);
+	wm8731_write(codec, WM8731_ROUT1V, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_LINVOL);
-	wm8731_write(codec, WM8731_LINVOL, reg | 0x0100);
+	wm8731_write(codec, WM8731_LINVOL, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_RINVOL);
-	wm8731_write(codec, WM8731_RINVOL, reg | 0x0100);
+	wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100);
 
 	wm8731_add_controls(codec);
 	wm8731_add_widgets(codec);
Signature · 3 lines
Ville Syrjälä
[email protected]
http://www.sci.fi/~syrjala/
Applied
#1 lore raw

At Sun, 25 Nov 2007 21:25:03 +0200,

Quoted 8 lines · Ville Syrjälä

soc/wm8731: Fix stereo mixer controls

Disable the simultaneous load feature for the line in and headphone out volume registers. This allows left and right volume levels to be controlled separately.

Signed-off-by Ville Syrjala <[email protected]>

Applied to ALSA HG tree. Thanks.

Takashi

Quoted 33 lines

---

sound/soc/codecs/wm8731.c +4 -4
index 7ca0b52..57fb95a 100644
@@ -562,13 +562,13 @@ static int wm8731_init(struct snd_soc_device *socdev)
 
 	/* set the update bits */
 	reg = wm8731_read_reg_cache(codec, WM8731_LOUT1V);
-	wm8731_write(codec, WM8731_LOUT1V, reg | 0x0100);
+	wm8731_write(codec, WM8731_LOUT1V, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_ROUT1V);
-	wm8731_write(codec, WM8731_ROUT1V, reg | 0x0100);
+	wm8731_write(codec, WM8731_ROUT1V, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_LINVOL);
-	wm8731_write(codec, WM8731_LINVOL, reg | 0x0100);
+	wm8731_write(codec, WM8731_LINVOL, reg & ~0x0100);
 	reg = wm8731_read_reg_cache(codec, WM8731_RINVOL);
-	wm8731_write(codec, WM8731_RINVOL, reg | 0x0100);
+	wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100);
 
 	wm8731_add_controls(codec);
 	wm8731_add_widgets(codec);
Signature · 7 lines
Ville Syrjälä
[email protected]
http://www.sci.fi/~syrjala/
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel