From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Ian Lartey <ian@opensource.wolfsonmicro.com>,
Dimitris Papastamos <dp@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 07/10 v2] ASoC: wm8960: Convert to snd_soc_cache_sync
Date: Thu, 06 Oct 2011 15:25:02 +0800 [thread overview]
Message-ID: <1317885902.13399.25.camel@phoenix> (raw)
In-Reply-To: <1317881919.13399.11.camel@phoenix>
Convert to snd_soc_cache_sync for sync reg_cache with the hardware.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
v2: Just found in v1 I put snd_soc_cache_sync() at wrong place in
wm8960_set_bias_level_capless().
sound/soc/codecs/wm8960.c | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 831c20f..e8262a0 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -81,6 +81,17 @@ struct wm8960_priv {
int playback_fs;
};
+static int wm8960_volatile_register(struct snd_soc_codec *codec,
+ unsigned int reg)
+{
+ switch (reg) {
+ case WM8960_RESET:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
#define wm8960_reset(c) snd_soc_write(c, WM8960_RESET, 0)
/* enumerated controls */
@@ -558,6 +569,7 @@ static int wm8960_mute(struct snd_soc_dai *dai, int mute)
static int wm8960_set_bias_level_out3(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
+ int ret;
u16 reg;
switch (level) {
@@ -574,6 +586,12 @@ 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) {
+ ret = snd_soc_cache_sync(codec);
+ if (ret < 0) {
+ dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
+ return ret;
+ }
+
/* Enable anti-pop features */
snd_soc_write(codec, WM8960_APOP1,
WM8960_POBCTRL | WM8960_SOFT_ST |
@@ -620,7 +638,7 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
- int reg;
+ int reg, ret;
switch (level) {
case SND_SOC_BIAS_ON:
@@ -697,6 +715,13 @@ static int wm8960_set_bias_level_capless(struct snd_soc_codec *codec,
WM8960_BUFDCOPEN);
break;
+ case SND_SOC_BIAS_OFF:
+ ret = snd_soc_cache_sync(codec);
+ if (ret < 0) {
+ dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
+ return ret;
+ }
+ break;
default:
break;
}
@@ -901,16 +926,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;
@@ -998,6 +1013,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8960 = {
.reg_cache_size = ARRAY_SIZE(wm8960_reg),
.reg_word_size = sizeof(u16),
.reg_cache_default = wm8960_reg,
+ .volatile_register = wm8960_volatile_register,
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
--
1.7.4.1
next prev parent reply other threads:[~2011-10-06 7:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 6:10 [PATCH 00/10] Convert wm8xxx codec drivers to use snd_soc_cache_sync Axel Lin
2011-10-06 6:11 ` [PATCH 01/10] ASoC: wm8510: Convert to snd_soc_cache_sync Axel Lin
2011-10-06 13:22 ` Mark Brown
2011-10-06 6:13 ` [PATCH 02/10] ASoC: wm8711: " Axel Lin
2011-10-06 6:14 ` [PATCH 03/10] ASoC: wm8731: " Axel Lin
2011-10-06 6:15 ` [PATCH 04/10] ASoC: wm8750: " Axel Lin
2011-10-06 6:16 ` [PATCH 05/10] ASoC: wm8776: " Axel Lin
2011-10-06 6:17 ` [PATCH 06/10] ASoC: wm8940: " Axel Lin
2011-10-06 11:28 ` Jonathan Cameron
2011-10-06 11:33 ` Axel Lin
2011-10-06 13:18 ` Mark Brown
2011-10-06 13:35 ` Jonathan Cameron
2011-10-06 6:18 ` [PATCH 07/10] ASoC: wm8960: " Axel Lin
2011-10-06 7:25 ` Axel Lin [this message]
2011-10-06 6:19 ` [PATCH 08/10] ASoC: wm8971: " Axel Lin
2011-10-06 6:20 ` [PATCH 09/10] ASoC: wm8974: " Axel Lin
2011-10-06 6:21 ` [PATCH 10/10] ASoC: wm8988: " Axel Lin
2011-10-06 6:52 ` [PATCH 00/10] Convert wm8xxx codec drivers to use snd_soc_cache_sync Axel Lin
2011-10-06 7:10 ` Axel Lin
2011-10-06 10:14 ` 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=1317885902.13399.25.camel@phoenix \
--to=axel.lin@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dp@opensource.wolfsonmicro.com \
--cc=ian@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