All of lore.kernel.org
 help / color / mirror / Atom feed
From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>,
	Dimitris Papastamos <dp@opensource.wolfsonmicro.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH v3 07/10] ASoC: wm8960: Convert to snd_soc_cache_sync
Date: Fri, 07 Oct 2011 21:50:23 +0800	[thread overview]
Message-ID: <1317995423.9906.14.camel@phoenix> (raw)
In-Reply-To: <1317994508.9906.1.camel@phoenix>

Convert to snd_soc_cache_sync for sync reg_cache with the hardware.

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

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 831c20f..2df253c 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -574,6 +574,8 @@ static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
 
 	case SND_SOC_BIAS_STANDBY:
 		if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+			snd_soc_cache_sync(codec);
+
 			/* Enable anti-pop features */
 			snd_soc_write(codec, WM8960_APOP1,
 				      WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -676,6 +678,9 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
 					    WM8960_VREF | WM8960_VMID_MASK, 0);
 			break;
 
+		case SND_SOC_BIAS_OFF:
+			snd_soc_cache_sync(codec);
+			break;
 		default:
 			break;
 		}
@@ -901,16 +906,6 @@ static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
 static int wm8960_resume(struct snd_soc_codec *codec)
 {
 	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
-	int i;
-	u8 data[2];
-	u16 *cache = codec->reg_cache;
-
-	/* Sync reg_cache with the hardware */
-	for (i = 0; i < ARRAY_SIZE(wm8960_reg); i++) {
-		data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
-		data[1] = cache[i] & 0x00ff;
-		codec->hw_write(codec->control_data, data, 2);
-	}
 
 	wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 	return 0;
-- 
1.7.4.1

  parent reply	other threads:[~2011-10-07 13:50 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-07 13:35 [PATCH v3 00/10] Convert wm8xxx codec drivers to use snd_soc_write/snd_soc_cache_sync Axel Lin
2011-10-07 13:35 ` Axel Lin
2011-10-07 13:36 ` [PATCH v3 01/10] ASoC: wm8510: Convert to snd_soc_cache_sync Axel Lin
2011-10-07 13:36   ` Axel Lin
2011-10-10  9:33   ` Mark Brown
2011-10-10  9:33     ` Mark Brown
2011-10-07 13:37 ` [PATCH v3 02/10] ASoC: wm8711: " Axel Lin
2011-10-07 13:37   ` Axel Lin
2011-10-07 13:39 ` [PATCH v3 03/10] ASoC: wm8731: " Axel Lin
2011-10-07 13:39   ` Axel Lin
2011-10-07 13:40 ` [PATCH v3 04/10] ASoC: wm8750: " Axel Lin
2011-10-07 13:40   ` Axel Lin
2011-10-07 13:41 ` [PATCH v3 05/10] ASoC: wm8776: " Axel Lin
2011-10-07 13:41   ` Axel Lin
2011-10-07 13:42 ` [PATCH v3 06/10] ASoC: wm8940: " Axel Lin
2011-10-07 13:50 ` Axel Lin [this message]
2011-10-07 13:52 ` [PATCH v3 08/10] ASoC: wm8971: " Axel Lin
2011-10-07 13:52 ` [PATCH v3 09/10] ASoC: wm8974: " Axel Lin
2011-10-07 13:53 ` [PATCH v3 10/10] ASoC: wm8988: " Axel Lin

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=1317995423.9906.14.camel@phoenix \
    --to=axel.lin@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=dp@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.com \
    /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 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.