From: Daniel Mack <daniel@caiaq.de>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Timur Tabi <timur@freescale.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver
Date: Wed, 25 Nov 2009 15:36:27 +0100 [thread overview]
Message-ID: <1259159787-21876-1-git-send-email-daniel@caiaq.de> (raw)
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 | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 8069023..b1d4b5d 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,7 @@ struct cs4270_private {
unsigned int mode; /* The mode (I2S or left-justified) */
unsigned int slave_mode;
unsigned int manual_mute;
+ struct regulator *va_reg;
};
/**
@@ -462,27 +464,38 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
* @dai: the SOC DAI
* @mute: 0 = disable mute, 1 = enable mute
*
- * This function toggles the mute bits in the MUTE register. The CS4270's
+ * This function toggles the mute bits in the MUTE register and switches
+ * the registered VA power regulator, if it was registered. The CS4270's
* mute capability is intended for external muting circuitry, so if the
* board does not have the MUTEA or MUTEB pins connected to such circuitry,
- * then this function will do nothing.
+ * and no power regulator was specified, then this function will do nothing.
*/
static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute)
{
struct snd_soc_codec *codec = dai->codec;
struct cs4270_private *cs4270 = codec->private_data;
- int reg6;
+ int reg6, err;
reg6 = snd_soc_read(codec, CS4270_MUTE);
if (mute)
reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B;
else {
+ if (cs4270->va_reg)
+ regulator_enable(cs4270->va_reg);
+
reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B);
reg6 |= cs4270->manual_mute;
}
- return snd_soc_write(codec, CS4270_MUTE, reg6);
+ err = snd_soc_write(codec, CS4270_MUTE, reg6);
+ if (err)
+ return err;
+
+ if (cs4270->va_reg && mute)
+ regulator_disable(cs4270->va_reg);
+
+ return 0;
}
/**
@@ -579,6 +592,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. */
@@ -606,6 +620,14 @@ static int cs4270_probe(struct platform_device *pdev)
goto error_free_pcms;
}
+#ifdef CONFIG_REGULATOR
+ /* get the regulator if there is one read<y for us */
+ cs4270->va_reg = regulator_get(&pdev->dev, "va");
+
+ if (IS_ERR(cs4270->va_reg))
+ cs4270->va_reg = NULL;
+#endif
+
return 0;
error_free_pcms:
@@ -623,9 +645,14 @@ 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)
+ regulator_put(cs4270->va_reg);
+
return 0;
};
--
1.6.5.2
next reply other threads:[~2009-11-25 14:36 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 14:36 Daniel Mack [this message]
2009-11-25 15:01 ` [PATCH] ALSA: ASoc: Add regulator support to CS4270 codec driver 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
[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=1259159787-21876-1-git-send-email-daniel@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