From: Daniel Mack <daniel@caiaq.de>
To: Timur Tabi <timur@freescale.com>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: Re: [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver
Date: Mon, 30 Nov 2009 11:12:23 +0100 [thread overview]
Message-ID: <20091130101223.GZ29442@buzzloop.caiaq.de> (raw)
In-Reply-To: <20091129083554.GC14091@buzzloop.caiaq.de>
On Sun, Nov 29, 2009 at 09:35:54AM +0100, Daniel Mack wrote:
> Anyway - I'll rebase the driver to 'for-2.6.33' so you can give it a
> try.
See below.
Daniel
>From 40f036c11cf36d6832431a4fda4e1ab1a2cf5b2e 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 | 114 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index ffe122d..279a644 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,12 @@ struct cs4270_private {
unsigned int mode; /* The mode (I2S or left-justified) */
unsigned int slave_mode;
unsigned int manual_mute;
+
+ /* power domain regulators */
+ struct regulator *va_reg;
+ struct regulator *vd_reg;
+ struct regulator *vlc_reg;
+ bool va_reg_enabled;
};
/**
@@ -458,6 +465,50 @@ 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)
+{
+ int ret;
+ struct cs4270_private *cs4270 = codec->private_data;
+
+ switch (level) {
+ case SND_SOC_BIAS_ON:
+ case SND_SOC_BIAS_PREPARE:
+ if (!cs4270->va_reg_enabled) {
+ ret = regulator_enable(cs4270->va_reg);
+ if (ret < 0)
+ return ret;
+
+ cs4270->va_reg_enabled = true;
+ }
+
+ break;
+ case SND_SOC_BIAS_STANDBY:
+ case SND_SOC_BIAS_OFF:
+ if (cs4270->va_reg_enabled) {
+ ret = regulator_disable(cs4270->va_reg);
+ if (ret < 0)
+ return ret;
+
+ 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 +630,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,9 +651,32 @@ static int cs4270_probe(struct platform_device *pdev)
goto error_free_pcms;
}
+ /* get the power supply regulators */
+ cs4270->va_reg = regulator_get(codec->dev, "va");
+ cs4270->vd_reg = regulator_get(codec->dev, "vd");
+ cs4270->vlc_reg = regulator_get(codec->dev, "vlc");
+
+ if (IS_ERR(cs4270->va_reg) ||
+ IS_ERR(cs4270->vd_reg) ||
+ IS_ERR(cs4270->vlc_reg)) {
+ dev_err(codec->dev,
+ "failed to get supplies for device %s\n",
+ dev_name(codec->dev));
+ goto error_free_pcms;
+ }
+
+ regulator_enable(cs4270->vd_reg);
+ regulator_enable(cs4270->vlc_reg);
+
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
return 0;
error_free_pcms:
+ regulator_put(cs4270->va_reg);
+ regulator_put(cs4270->vd_reg);
+ regulator_put(cs4270->vlc_reg);
+
snd_soc_free_pcms(socdev);
return ret;
@@ -616,9 +691,21 @@ 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);
+ if (cs4270->va_reg_enabled)
+ regulator_disable(cs4270->va_reg);
+
+ regulator_disable(cs4270->vd_reg);
+ regulator_disable(cs4270->vlc_reg);
+
+ regulator_put(cs4270->va_reg);
+ regulator_put(cs4270->vd_reg);
+ regulator_put(cs4270->vlc_reg);
+
return 0;
};
@@ -692,6 +779,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 */
@@ -799,17 +888,38 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id);
static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg)
{
struct snd_soc_codec *codec = cs4270_codec;
- int reg = snd_soc_read(codec, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
+ struct cs4270_private *cs4270 = codec->private_data;
+ int reg, ret;
- return snd_soc_write(codec, CS4270_PWRCTL, reg);
+ reg = snd_soc_read(codec, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
+ if (reg < 0)
+ return reg;
+
+ ret = snd_soc_write(codec, CS4270_PWRCTL, reg);
+ if (ret < 0)
+ return ret;
+
+ ret = cs4270_set_bias_level(codec, SND_SOC_BIAS_OFF);
+ if (ret < 0)
+ return ret;
+
+ regulator_disable(cs4270->vd_reg);
+ regulator_disable(cs4270->vlc_reg);
+
+ return 0;
}
static int cs4270_soc_resume(struct platform_device *pdev)
{
struct snd_soc_codec *codec = cs4270_codec;
+ struct cs4270_private *cs4270 = codec->private_data;
struct i2c_client *i2c_client = codec->control_data;
int reg;
+ regulator_enable(cs4270->vd_reg);
+ regulator_enable(cs4270->vlc_reg);
+ cs4270_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
/* In case the device was put to hard reset during sleep, we need to
* wait 500ns here before any I2C communication. */
ndelay(500);
--
1.6.5.2
next prev parent reply other threads:[~2009-11-30 10:12 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
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 [this message]
[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=20091130101223.GZ29442@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox