From: Daniel Mack <daniel@caiaq.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org, Timur Tabi <timur@freescale.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: Re: [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver
Date: Thu, 26 Nov 2009 16:48:07 +0100 [thread overview]
Message-ID: <20091126154807.GI14091@buzzloop.caiaq.de> (raw)
In-Reply-To: <20091125153804.GA12750@rakim.wolfsonmicro.main>
Hi Mark,
On Wed, Nov 25, 2009 at 03:38:04PM +0000, Mark Brown wrote:
> On Wed, Nov 25, 2009 at 04:20:52PM +0100, Daniel Mack wrote:
>
> > Ok - which place would you suggest for it? Is there an ASoC callback I
> > can hook on to tell me when the whole codec isn't used anymore? I can
> > only see startup/shutdown, but I would need to my own snd_pc_substream
> > handling login in there. Other drivers do that in the probe/remove
>
> set_bias_level(). If the device is idle then the bias will be held in
> STANDBY (or OFF in future). If you are happy switching off the analogue
> supply separately to the others then turn that one on when in PREPARE or
> ON, and kill the others only in OFF.
I implemented that now and it seems to work fine. However, I'm unsure
about two details:
- I only added VA for now because when VD is disabled, we need to
restore all codec information, and I can't test that here. We can
still add that later, right?
- I'm tracking the va_reg enable state inside the driver to take anyone
else's reference. Is that the way do do it?
Thanks,
Daniel
>From ab10605ccad8d4409e541deb530b03e418435b8f Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Wed, 25 Nov 2009 15:31:25 +0100
Subject: [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
---
sound/soc/codecs/cs4270.c | 62 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 8069023..acbe961 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -28,6 +28,7 @@
#include <sound/initval.h>
#include <linux/i2c.h>
#include <linux/delay.h>
+#include <linux/regulator/consumer.h>
#include "cs4270.h"
@@ -114,6 +115,10 @@ struct cs4270_private {
unsigned int mode; /* The mode (I2S or left-justified) */
unsigned int slave_mode;
unsigned int manual_mute;
+
+ /* power domain regulators (optional) */
+ struct regulator *va_reg;
+ bool va_reg_enabled;
};
/**
@@ -458,6 +463,42 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
}
/**
+ * cs4270_set_bias_level - catches BIAS level changes
+ * @dai: the SOC DAI
+ * @level: the new BIAS level
+ *
+ * This function controls the voltage regulators to properly
+ * power up/down the voltage regulator domains
+ */
+
+static int cs4270_set_bias_level(struct snd_soc_codec *codec,
+ enum snd_soc_bias_level level)
+{
+ struct cs4270_private *cs4270 = codec->private_data;
+
+ switch (level) {
+ case SND_SOC_BIAS_ON:
+ case SND_SOC_BIAS_PREPARE:
+ /* Full power on */
+ if (cs4270->va_reg && !cs4270->va_reg_enabled) {
+ regulator_enable(cs4270->va_reg);
+ cs4270->va_reg_enabled = true;
+ }
+ break;
+ case SND_SOC_BIAS_STANDBY:
+ case SND_SOC_BIAS_OFF:
+ if (cs4270->va_reg && cs4270->va_reg_enabled) {
+ regulator_disable(cs4270->va_reg);
+ cs4270->va_reg_enabled = false;
+ }
+ break;
+ }
+
+ codec->bias_level = level;
+ return 0;
+}
+
+/**
* cs4270_dai_mute - enable/disable the CS4270 external mute
* @dai: the SOC DAI
* @mute: 0 = disable mute, 1 = enable mute
@@ -579,6 +620,7 @@ static int cs4270_probe(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = cs4270_codec;
+ struct cs4270_private *cs4270 = codec->private_data;
int ret;
/* Connect the codec to the socdev. snd_soc_new_pcms() needs this. */
@@ -599,6 +641,13 @@ static int cs4270_probe(struct platform_device *pdev)
goto error_free_pcms;
}
+ /* get the power supply regulators (optional) */
+ cs4270->va_reg = regulator_get(&pdev->dev, "va");
+ if (IS_ERR(cs4270->va_reg))
+ cs4270->va_reg = NULL;
+
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
/* And finally, register the socdev */
ret = snd_soc_init_card(socdev);
if (ret < 0) {
@@ -623,9 +672,13 @@ error_free_pcms:
static int cs4270_remove(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+ struct snd_soc_codec *codec = cs4270_codec;
+ struct cs4270_private *cs4270 = codec->private_data;
snd_soc_free_pcms(socdev);
+ regulator_put(cs4270->va_reg);
+
return 0;
};
@@ -699,6 +752,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
codec->write = cs4270_i2c_write;
codec->reg_cache = cs4270->reg_cache;
codec->reg_cache_size = CS4270_NUMREGS;
+ codec->bias_level = SND_SOC_BIAS_OFF;
+ codec->set_bias_level = cs4270_set_bias_level;
/* The I2C interface is set up, so pre-fill our register cache */
@@ -808,6 +863,8 @@ static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg)
struct cs4270_private *cs4270 = i2c_get_clientdata(client);
struct snd_soc_codec *codec = &cs4270->codec;
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
return snd_soc_suspend_device(codec->dev);
}
@@ -816,6 +873,11 @@ static int cs4270_i2c_resume(struct i2c_client *client)
struct cs4270_private *cs4270 = i2c_get_clientdata(client);
struct snd_soc_codec *codec = &cs4270->codec;
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
+ if (codec->suspend_bias_level == SND_SOC_BIAS_ON)
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_ON);
+
return snd_soc_resume_device(codec->dev);
}
--
1.6.5.2
next prev parent reply other threads:[~2009-11-26 15:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 14:36 [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver Daniel Mack
2009-11-25 15:01 ` Mark Brown
2009-11-25 15:20 ` Daniel Mack
2009-11-25 15:38 ` Mark Brown
2009-11-25 15:46 ` Daniel Mack
2009-11-26 15:48 ` Daniel Mack [this message]
2009-11-26 16:03 ` Mark Brown
2009-11-26 17:42 ` Daniel Mack
2009-11-27 11:25 ` Mark Brown
2009-11-27 12:41 ` Daniel Mack
2009-11-27 13:32 ` Mark Brown
2009-11-28 20:23 ` Timur Tabi
2009-11-28 20:31 ` Mark Brown
2009-11-28 22:18 ` Timur Tabi
2009-11-29 0:44 ` Daniel Mack
2009-11-29 4:34 ` Timur Tabi
2009-11-29 8:35 ` Daniel Mack
2009-11-30 10:12 ` Daniel Mack
[not found] ` <5610599F537DD74A8D1F5CC946A7507303478C40@az33exm25.fsl.freescale.net>
2009-11-30 12:01 ` Mark Brown
2009-11-30 12:36 ` Daniel Mack
2009-11-30 15:57 ` Daniel Mack
2009-11-30 16:12 ` Mark Brown
2009-11-30 16:51 ` Daniel Mack
2009-11-30 16:56 ` Daniel Mack
2009-12-04 12:00 ` Daniel Mack
2009-12-04 12:07 ` Mark Brown
2009-12-05 2:54 ` Timur Tabi
2009-12-05 3:51 ` Mark Brown
2009-12-05 17:03 ` Timur Tabi
2009-12-07 13:16 ` 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=20091126154807.GI14091@buzzloop.caiaq.de \
--to=daniel@caiaq.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@slimlogic.co.uk \
--cc=timur@freescale.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.