From 4ed33f91c47bbdf9af49615b7fd9b3686c1c9d94 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 30 Jun 2009 19:01:09 +0100
Subject: [PATCH] --- yaml --- r: 157657 b: refs/heads/master c:
 df1ef7a38db21a92239c775a28f0c69124c9b454 h: refs/heads/master i:   157655:
 ca6c2cd4b5f3c5bb7887c27116667afcb35ce555 v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/wm8974.c | 30 +++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e9e31859bcb3..983e56bcc7ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 372a14a4a4db18751cd092aa3fe2a58216a8fc2f
+refs/heads/master: df1ef7a38db21a92239c775a28f0c69124c9b454
diff --git a/trunk/sound/soc/codecs/wm8974.c b/trunk/sound/soc/codecs/wm8974.c
index d2a36ad256c5..c5d47bcd14a0 100644
--- a/trunk/sound/soc/codecs/wm8974.c
+++ b/trunk/sound/soc/codecs/wm8974.c
@@ -46,6 +46,9 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
 	0x0000,
 };
 
+#define WM8974_POWER1_BIASEN  0x08
+#define WM8974_POWER1_BUFIOEN 0x10
+
 struct wm8974_priv {
 	struct snd_soc_codec codec;
 	u16 reg_cache[WM8974_CACHEREGNUM];
@@ -528,22 +531,35 @@ static int wm8974_mute(struct snd_soc_dai *dai, int mute)
 static int wm8974_set_bias_level(struct snd_soc_codec *codec,
 	enum snd_soc_bias_level level)
 {
+	u16 power1 = wm8974_read_reg_cache(codec, WM8974_POWER1) & ~0x3;
+
 	switch (level) {
 	case SND_SOC_BIAS_ON:
-		wm8974_write(codec, WM8974_POWER1, 0x1ff);
-		wm8974_write(codec, WM8974_POWER2, 0x1ff);
-		wm8974_write(codec, WM8974_POWER3, 0x1ff);
-		break;
 	case SND_SOC_BIAS_PREPARE:
+		power1 |= 0x1;  /* VMID 50k */
+		wm8974_write(codec, WM8974_POWER1, power1);
 		break;
+
 	case SND_SOC_BIAS_STANDBY:
+		power1 |= WM8974_POWER1_BIASEN | WM8974_POWER1_BUFIOEN;
+
+		if (codec->bias_level == SND_SOC_BIAS_OFF) {
+			/* Initial cap charge at VMID 5k */
+			wm8974_write(codec, WM8974_POWER1, power1 | 0x3);
+			mdelay(100);
+		}
+
+		power1 |= 0x2;  /* VMID 500k */
+		wm8974_write(codec, WM8974_POWER1, power1);
 		break;
+
 	case SND_SOC_BIAS_OFF:
-		wm8974_write(codec, WM8974_POWER1, 0x0);
-		wm8974_write(codec, WM8974_POWER2, 0x0);
-		wm8974_write(codec, WM8974_POWER3, 0x0);
+		wm8974_write(codec, WM8974_POWER1, 0);
+		wm8974_write(codec, WM8974_POWER2, 0);
+		wm8974_write(codec, WM8974_POWER3, 0);
 		break;
 	}
+
 	codec->bias_level = level;
 	return 0;
 }