From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
To: alsa-devel@alsa-project.org
Cc: broonie@opensource.wolfsonmicro.com, lrg@slimlogic.co.uk
Subject: [PATCH v2 5/8] ASoC: TWL4030: Helper to check chip default registers
Date: Wed, 26 May 2010 11:38:18 +0300 [thread overview]
Message-ID: <1274863101-18514-6-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1274863101-18514-1-git-send-email-peter.ujfalusi@nokia.com>
Since the twl4030 codec driver supports different version
of the PM chip, a helper function can come handy, which
can check the driver's default versus the chip values.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/twl4030.c | 23 +++++++++++++++++++++++
sound/soc/codecs/twl4030.h | 1 +
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 08f24de..cd913ef 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -243,6 +243,25 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
udelay(10);
}
+static inline void twl4030_check_defaults(struct snd_soc_codec *codec)
+{
+ int i, difference = 0;
+ u8 val;
+
+ dev_dbg(codec->dev, "Checking TWL audio default configuration\n");
+ for (i = 1; i <= TWL4030_REG_MISC_SET_2; i++) {
+ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, i);
+ if (val != twl4030_reg[i]) {
+ difference++;
+ dev_dbg(codec->dev,
+ "Reg 0x%02x: chip: 0x%02x driver: 0x%02x\n",
+ i, val, twl4030_reg[i]);
+ }
+ }
+ dev_dbg(codec->dev, "Found %d non maching registers. %s\n",
+ difference, difference ? "Not OK" : "OK");
+}
+
static void twl4030_init_chip(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
@@ -252,6 +271,10 @@ static void twl4030_init_chip(struct platform_device *pdev)
u8 reg, byte;
int i = 0;
+ /* Check defaults, if instructed before anything else */
+ if (setup && setup->check_defaults)
+ twl4030_check_defaults(codec);
+
/* Refresh APLL_CTL register from HW */
twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte,
TWL4030_REG_APLL_CTL);
diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h
index c98e303..c22542c 100644
--- a/sound/soc/codecs/twl4030.h
+++ b/sound/soc/codecs/twl4030.h
@@ -43,6 +43,7 @@ struct twl4030_setup_data {
unsigned int ramp_delay_value;
unsigned int sysclk;
unsigned int offset_cncl_path;
+ unsigned int check_defaults:1;
unsigned int hs_extmute:1;
void (*set_hs_extmute)(int mute);
};
--
1.7.1
next prev parent reply other threads:[~2010-05-26 8:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 8:38 [PATCH v2 0/8] ASoC: TWL4030: put the codec to off when not active Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 1/8] ASoC: TWL4030: Revisit codec defaults Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 2/8] ASoC: TWL4030: Remove wrapper for power down Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 3/8] ASoC: TWL4030: Make offset cancellation path configurable Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 4/8] ASoC: TWL4030: Optimize the power up sequence Peter Ujfalusi
2010-05-26 8:38 ` Peter Ujfalusi [this message]
2010-05-26 8:38 ` [PATCH v2 6/8] ASoC: TWL4030: Correct the ARXR2_APGA_CTL chip default Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 7/8] ASoC: TWL4030: Use BIAS_OFF instead of BIAS_STANDBY, when not in use Peter Ujfalusi
2010-05-26 8:38 ` [PATCH v2 8/8] ASoC: TWL4030: Add functionalty to reset the registers Peter Ujfalusi
2010-05-26 20:09 ` Mark Brown
2010-05-31 9:39 ` [PATCH v2 0/8] ASoC: TWL4030: put the codec to off when not active Liam Girdwood
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=1274863101-18514-6-git-send-email-peter.ujfalusi@nokia.com \
--to=peter.ujfalusi@nokia.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@slimlogic.co.uk \
/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;
as well as URLs for NNTP newsgroup(s).