[PATCH 1/2] ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode

[PATCH 1/2] ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode

[Axel Lin]

DACSLOPE bit of Register 06h ADC and DAC Control 2:
        0: Normal mode
        1: Sloping stop-band mode

Thus in the case of normal mode, we should clear DACSLOPE bit.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/codecs/wm8961.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index a0bb972..e4638e6 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -710,7 +710,7 @@ static int wm8961_hw_params(struct snd_pcm_substream *substream,
 	if (fs <= 24000)
 		reg |= WM8961_DACSLOPE;
 	else
-		reg &= WM8961_DACSLOPE;
+		reg &= ~WM8961_DACSLOPE;
 	snd_soc_write(codec, WM8961_ADC_DAC_CONTROL_2, reg);
 
 	return 0;
-- 
1.7.2

[PATCH 2/2] ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000

[Axel Lin]

MCLKDIV bit of Register 04h Clocking1:
	0 : Divide by 1
	1 : Divide by 2

Thus in the case of freq <= 16500000, we should clear MCLKDIV bit.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/codecs/wm8961.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index e4638e6..6b22ef2 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -735,7 +735,7 @@ static int wm8961_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 		freq /= 2;
 	} else {
 		dev_dbg(codec->dev, "Using MCLK/1 for %dHz MCLK\n", freq);
-		reg &= WM8961_MCLKDIV;
+		reg &= ~WM8961_MCLKDIV;
 	}
 
 	snd_soc_write(codec, WM8961_CLOCKING1, reg);
-- 
1.7.2

Re: [PATCH 1/2] ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode

[Liam Girdwood]

On Wed, 2010-11-24 at 10:20 +0800, Axel Lin wrote:
> DACSLOPE bit of Register 06h ADC and DAC Control 2:
>         0: Normal mode
>         1: Sloping stop-band mode
> 
> Thus in the case of normal mode, we should clear DACSLOPE bit.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Both

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH 1/2] ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode

[Mark Brown]

On Wed, Nov 24, 2010 at 10:48:32AM +0000, Liam Girdwood wrote:
> On Wed, 2010-11-24 at 10:20 +0800, Axel Lin wrote:
> > DACSLOPE bit of Register 06h ADC and DAC Control 2:
> >         0: Normal mode
> >         1: Sloping stop-band mode
> > 
> > Thus in the case of normal mode, we should clear DACSLOPE bit.
> > 
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>

> Both

> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

And applied.  Axel, the list for ALSA patches is alsa-devel@alsa-project.org