[alsa-devel] [PATCH] 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 syrjala@sci.fi ---
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 7ca0b52..57fb95a 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -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);
At Sun, 25 Nov 2007 21:25:03 +0200, Ville Syrjälä wrote:
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 syrjala@sci.fi
Applied to ALSA HG tree. Thanks.
Takashi
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 7ca0b52..57fb95a 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -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);
-- Ville Syrjälä syrjala@sci.fi http://www.sci.fi/~syrjala/ _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (2)
-
Takashi Iwai -
Ville Syrjälä