From: Axel Lin <axel.lin@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: alsa-devel@alsa-project.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Subject: [PATCH 11/11] ASoC: wm8990: Convert to snd_soc_cache_sync
Date: Fri, 07 Oct 2011 07:56:53 +0800 [thread overview]
Message-ID: <1317945413.5579.17.camel@phoenix> (raw)
In-Reply-To: <1317944619.5579.1.camel@phoenix>
Convert codec->hw_write to snd_soc_cache_sync
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8990.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 100aeee..48e9dd9 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -36,6 +36,17 @@ struct wm8990_priv {
unsigned int pcmclk;
};
+static int wm8990_volatile_register(struct snd_soc_codec *codec,
+ unsigned int reg)
+{
+ switch (reg) {
+ case WM8990_RESET:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
/*
* wm8990 register cache. Note that register 0 is not included in the
* cache.
@@ -1156,6 +1167,7 @@ static int wm8990_mute(struct snd_soc_dai *dai, int mute)
static int wm8990_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
+ int ret;
u16 val;
switch (level) {
@@ -1171,6 +1183,12 @@ static int wm8990_set_bias_level(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 all output discharge bits */
snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
WM8990_DIS_RLINE | WM8990_DIS_OUT3 |
@@ -1319,19 +1337,6 @@ static int wm8990_suspend(struct snd_soc_codec *codec, pm_message_t state)
static int wm8990_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(wm8990_reg); i++) {
- if (i + 1 == WM8990_RESET)
- continue;
- data[0] = ((i + 1) << 1) | ((cache[i] >> 8) & 0x0001);
- data[1] = cache[i] & 0x00ff;
- codec->hw_write(codec->control_data, data, 2);
- }
-
wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
@@ -1392,6 +1397,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {
.reg_cache_size = ARRAY_SIZE(wm8990_reg),
.reg_word_size = sizeof(u16),
.reg_cache_default = wm8990_reg,
+ .volatile_register = wm8990_volatile_register,
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
--
1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
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 11/11] ASoC: wm8990: Convert to snd_soc_cache_sync
Date: Fri, 07 Oct 2011 07:56:53 +0800 [thread overview]
Message-ID: <1317945413.5579.17.camel@phoenix> (raw)
In-Reply-To: <1317944619.5579.1.camel@phoenix>
Convert codec->hw_write to snd_soc_cache_sync
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8990.c | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 100aeee..48e9dd9 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -36,6 +36,17 @@ struct wm8990_priv {
unsigned int pcmclk;
};
+static int wm8990_volatile_register(struct snd_soc_codec *codec,
+ unsigned int reg)
+{
+ switch (reg) {
+ case WM8990_RESET:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
/*
* wm8990 register cache. Note that register 0 is not included in the
* cache.
@@ -1156,6 +1167,7 @@ static int wm8990_mute(struct snd_soc_dai *dai, int mute)
static int wm8990_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
+ int ret;
u16 val;
switch (level) {
@@ -1171,6 +1183,12 @@ static int wm8990_set_bias_level(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 all output discharge bits */
snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
WM8990_DIS_RLINE | WM8990_DIS_OUT3 |
@@ -1319,19 +1337,6 @@ static int wm8990_suspend(struct snd_soc_codec *codec, pm_message_t state)
static int wm8990_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(wm8990_reg); i++) {
- if (i + 1 == WM8990_RESET)
- continue;
- data[0] = ((i + 1) << 1) | ((cache[i] >> 8) & 0x0001);
- data[1] = cache[i] & 0x00ff;
- codec->hw_write(codec->control_data, data, 2);
- }
-
wm8990_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
@@ -1392,6 +1397,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {
.reg_cache_size = ARRAY_SIZE(wm8990_reg),
.reg_word_size = sizeof(u16),
.reg_cache_default = wm8990_reg,
+ .volatile_register = wm8990_volatile_register,
};
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
--
1.7.4.1
next prev parent reply other threads:[~2011-10-06 23:57 UTC|newest]
Thread overview: 30+ 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:43 ` Axel Lin
2011-10-06 23:45 ` [PATCH 01/11] ASoC: wm8510: Convert to snd_soc_write Axel Lin
2011-10-06 23:45 ` Axel Lin
2011-10-07 2:40 ` [PATCH 01/11 RESEND] " Axel Lin
2011-10-07 2:40 ` Axel Lin
2011-10-07 9:57 ` Mark Brown
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:46 ` Axel Lin
2011-10-06 23:47 ` [PATCH 03/11] ASoC: wm8731: " Axel Lin
2011-10-06 23:47 ` Axel Lin
2011-10-06 23:49 ` [PATCH 04/11] ASoC: wm8750: " Axel Lin
2011-10-06 23:49 ` Axel Lin
2011-10-06 23:50 ` [PATCH 05/11] ASoC: wm8776: " Axel Lin
2011-10-06 23:50 ` 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:53 ` Axel Lin
2011-10-06 23:54 ` [PATCH 08/11] ASoC: wm8971: " Axel Lin
2011-10-06 23:54 ` Axel Lin
2011-10-06 23:55 ` [PATCH 09/11] ASoC: wm8974: " Axel Lin
2011-10-06 23:55 ` Axel Lin
2011-10-06 23:55 ` [PATCH 10/11] ASoC: wm8988: " Axel Lin
2011-10-06 23:55 ` Axel Lin
2011-10-06 23:56 ` Axel Lin [this message]
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
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=1317945413.5579.17.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 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.