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>,
alsa-devel@alsa-project.org
Subject: [PATCH 01/11] ASoC: wm8510: Convert to snd_soc_write
Date: Fri, 07 Oct 2011 07:45:07 +0800 [thread overview]
Message-ID: <1317944707.5579.3.camel@phoenix> (raw)
In-Reply-To: <1317944619.5579.1.camel@phoenix>
Convert codec->hw_write to snd_soc_write
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8510.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 55a4c83..fc8bc9c 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -463,6 +463,26 @@ static int wm8510_mute(struct snd_soc_dai *dai, int mute)
return 0;
}
+static void wm8510_sync_cache(struct snd_soc_codec *codec)
+{
+ short i;
+ u16 *cache;
+
+ if (!codec->cache_sync)
+ return;
+ codec->cache_only = 0;
+ codec->cache_bypass = 0;
+ /* restore cache */
+ cache = codec->reg_cache;
+ for (i = 0; i < codec->driver->reg_cache_size; i++) {
+ if (i == WM8510_RESET || cache[i] == wm8510_reg[i])
+ continue;
+ snd_soc_write(codec, i, cache[i]);
+ }
+ codec->cache_bypass = 1;
+ codec->cache_sync = 0;
+}
+
/* liam need to make this lower power with dapm */
static int wm8510_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
@@ -480,6 +500,8 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
power1 |= WM8510_POWER1_BIASEN | WM8510_POWER1_BUFIOEN;
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+ wm8510_sync_cache(codec);
+
/* Initial cap charge at VMID 5k */
snd_soc_write(codec, WM8510_POWER1, power1 | 0x3);
mdelay(100);
@@ -541,18 +563,7 @@ static int wm8510_suspend(struct snd_soc_codec *codec, pm_message_t state)
static int wm8510_resume(struct snd_soc_codec *codec)
{
- int i;
- u8 data[2];
- u16 *cache = codec->reg_cache;
-
- /* Sync reg_cache with the hardware */
- for (i = 0; i < ARRAY_SIZE(wm8510_reg); i++) {
- data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
- data[1] = cache[i] & 0x00ff;
- codec->hw_write(codec->control_data, data, 2);
- }
wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
return 0;
}
--
1.7.4.1
next prev parent reply other threads:[~2011-10-06 23:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 23:43 [PATCH 00/11 v2] Convert wm8xxx codec drivers to use snd_soc_write/snd_soc_cache_sync Axel Lin
2011-10-06 23:45 ` Axel Lin [this message]
2011-10-07 2:40 ` [PATCH 01/11 RESEND] ASoC: wm8510: Convert to snd_soc_write Axel Lin
2011-10-07 9:57 ` Mark Brown
2011-10-07 13:10 ` Axel Lin
2011-10-06 23:46 ` [PATCH 02/11] ASoC: wm8711: " Axel Lin
2011-10-06 23:47 ` [PATCH 03/11] ASoC: wm8731: " Axel Lin
2011-10-06 23:49 ` [PATCH 04/11] ASoC: wm8750: " Axel Lin
2011-10-06 23:50 ` [PATCH 05/11] ASoC: wm8776: " Axel Lin
2011-10-06 23:52 ` [PATCH 06/11] ASoC: wm8940: Convert to snd_soc_cache_sync Axel Lin
2011-10-06 23:53 ` [PATCH 07/11] ASoC: wm8960: Convert to snd_soc_write Axel Lin
2011-10-06 23:54 ` [PATCH 08/11] ASoC: wm8971: " Axel Lin
2011-10-06 23:55 ` [PATCH 09/11] ASoC: wm8974: " Axel Lin
2011-10-06 23:55 ` [PATCH 10/11] ASoC: wm8988: " Axel Lin
2011-10-06 23:56 ` [PATCH 11/11] ASoC: wm8990: Convert to snd_soc_cache_sync Axel Lin
2011-10-07 10:23 ` 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=1317944707.5579.3.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox