From a5fbfea1c4e6426b711109b86f08033e5a65b2f5 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 4 Jul 2011 08:54:40 -0700
Subject: [PATCH] --- yaml --- r: 257567 b: refs/heads/master c:
 469bb638dc2a6ea87ea56256f25cc964deb3cf2b h: refs/heads/master i:   257565:
 ed7011203a33d970fb7897c977794cdb151c7ff8   257563:
 5098d82c999b4c53106a163178b67db0809ef48c   257559:
 4f4365060198c58e8cc26af379fdea2451ca5556   257551:
 ae57582f6920e30da0e10d3ca6caf20893a71a45   257535:
 eb967fc9663c1f6baccacbdb6fdd2a5a642cbc2f v: v3

---
 [refs]                            | 2 +-
 trunk/sound/soc/codecs/wm8994.c   | 2 ++
 trunk/sound/soc/tegra/tegra_i2s.c | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5fc7bef1fb4a..e46c3883ca44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5f9cfed12dc639cce5a8b6e741352980e05a8a9
+refs/heads/master: 469bb638dc2a6ea87ea56256f25cc964deb3cf2b
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index dc2350e6350b..70a68fd96c46 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/sound/soc/codecs/wm8994.c
@@ -1713,6 +1713,8 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
 		snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset,
 				    WM8994_FLL1_ENA | WM8994_FLL1_FRAC,
 				    reg);
+
+		msleep(5);
 	}
 
 	wm8994->fll[id].in = freq_in;
diff --git a/trunk/sound/soc/tegra/tegra_i2s.c b/trunk/sound/soc/tegra/tegra_i2s.c
index 2e5685512db0..f36b9969cfec 100644
--- a/trunk/sound/soc/tegra/tegra_i2s.c
+++ b/trunk/sound/soc/tegra/tegra_i2s.c
@@ -222,12 +222,18 @@ static int tegra_i2s_hw_params(struct snd_pcm_substream *substream,
 	if (i2sclock % (2 * srate))
 		reg |= TEGRA_I2S_TIMING_NON_SYM_ENABLE;
 
+	if (!i2s->clk_refs)
+		clk_enable(i2s->clk_i2s);
+
 	tegra_i2s_write(i2s, TEGRA_I2S_TIMING, reg);
 
 	tegra_i2s_write(i2s, TEGRA_I2S_FIFO_SCR,
 		TEGRA_I2S_FIFO_SCR_FIFO2_ATN_LVL_FOUR_SLOTS |
 		TEGRA_I2S_FIFO_SCR_FIFO1_ATN_LVL_FOUR_SLOTS);
 
+	if (!i2s->clk_refs)
+		clk_disable(i2s->clk_i2s);
+
 	return 0;
 }