Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Grzegorz Daniluk <g.daniluk@elproma.com.pl>
To: alsa-devel@alsa-project.org
Subject: [PATCH] ASoC: WM8940: incorrect mask for BCLKDIV
Date: Fri, 01 Oct 2010 10:23:43 +0200	[thread overview]
Message-ID: <4CA59A8F.3000800@elproma.com.pl> (raw)

corrected bitmask in BCLKDIV setting (wm8940_set_dai_clkdiv) and
bias_level in wm8940 register function.

best regards,
Grzegorz Daniluk

----
diff -urN a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
--- a/sound/soc/codecs/wm8940.c    2010-04-16 11:10:10.000000000 +0000
+++ b/sound/soc/codecs/wm8940.c    2010-09-29 14:12:17.263497290 +0000
@@ -514,7 +514,7 @@

     if ((Ndiv < 6) || (Ndiv > 12))
         printk(KERN_WARNING
-            "WM8940 N value %d outwith recommended range!d\n",
+            "WM8940 N value %d outwith recommended range!\n",
             Ndiv);

     pll_div.n = Ndiv;
@@ -604,7 +604,7 @@

     switch (div_id) {
     case WM8940_BCLKDIV:
-        reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3;
+        reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3;
         ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2));
         break;
     case WM8940_MCLKDIV:
@@ -800,9 +800,10 @@

     wm8940_dai.dev = codec->dev;

-    wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+    wm8940_set_bias_level(codec, SND_SOC_BIAS_PREPARE);

-    ret = snd_soc_write(codec, WM8940_POWER1, 0x180);
+    reg = snd_soc_read(codec, WM8940_POWER1);
+    ret = snd_soc_write(codec, WM8940_POWER1, reg | 0x180);
     if (ret < 0)
         return ret;

             reply	other threads:[~2010-10-01  8:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-01  8:23 Grzegorz Daniluk [this message]
2010-10-01 18:13 ` [PATCH] ASoC: WM8940: incorrect mask for BCLKDIV Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CA59A8F.3000800@elproma.com.pl \
    --to=g.daniluk@elproma.com.pl \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox