* [PATCH] soc/wm8731: Fix stereo mixer controls
@ 2007-11-25 19:25 Ville Syrjälä
2007-11-26 7:39 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Ville Syrjälä @ 2007-11-25 19:25 UTC (permalink / raw)
To: alsa-devel; +Cc: richard, liam.girdwood
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);
--
Ville Syrjälä
syrjala@sci.fi
http://www.sci.fi/~syrjala/
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] soc/wm8731: Fix stereo mixer controls
2007-11-25 19:25 [PATCH] soc/wm8731: Fix stereo mixer controls Ville Syrjälä
@ 2007-11-26 7:39 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2007-11-26 7:39 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: richard, liam.girdwood, alsa-devel
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-26 7:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-25 19:25 [PATCH] soc/wm8731: Fix stereo mixer controls Ville Syrjälä
2007-11-26 7:39 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.