From ffd5ec62f01afbbbb45278f22a06ff8cddddfa19 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date: Wed, 26 May 2010 11:38:18 +0300
Subject: [PATCH] --- yaml --- r: 206501 b: refs/heads/master c:
 9fdcc0f72af8801d8429a465a159d815774dbf6d h: refs/heads/master i:   206499:
 2c33fe4aecc9b5fa38a4c77d306e7feedc6675d9 v: v3

---
 [refs]                           |  2 +-
 trunk/sound/soc/codecs/twl4030.c | 25 ++++++++++++++++++++++++-
 trunk/sound/soc/codecs/twl4030.h |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1321f2088390..2792c6e8fb48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee4ccac7cea0e4a4f44bbb109285129e1b293461
+refs/heads/master: 9fdcc0f72af8801d8429a465a159d815774dbf6d
diff --git a/trunk/sound/soc/codecs/twl4030.c b/trunk/sound/soc/codecs/twl4030.c
index 08f24de406c2..30b7bbaf6aed 100644
--- a/trunk/sound/soc/codecs/twl4030.c
+++ b/trunk/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++) {
+		twl_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,8 +271,12 @@ 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,
+	twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte,
 			    TWL4030_REG_APLL_CTL);
 	twl4030_write_reg_cache(codec, TWL4030_REG_APLL_CTL, byte);
 
diff --git a/trunk/sound/soc/codecs/twl4030.h b/trunk/sound/soc/codecs/twl4030.h
index c98e30347e87..c22542c2690c 100644
--- a/trunk/sound/soc/codecs/twl4030.h
+++ b/trunk/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);
 };