From fd7171edb112dfb0ed4b427f11ad05bdd43dee88 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 23 Jan 2009 11:49:45 +0000
Subject: [PATCH] --- yaml --- r: 132799 b: refs/heads/master c:
 a435869cacbb581920df23411416bed533748bf1 h: refs/heads/master i:   132797:
 d2f6ce6a8b2345f7224a4251ab015e3ff925e745   132795:
 ed4716bb13f0da0e8b61325ff6c969d6c2dc3088   132791:
 cf572dd96b17f9c62028f1829fe7060766250b4c   132783:
 7cf8a9fcd798fad04319bfa6291a4b320d091e73   132767:
 ea74cd83d9c9f08561f399b4e92c261f5e3c3cef   132735:
 b30c5ffdca0dcab9ab2ac612efb0bac15f875595 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/pxa/zylonite.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 115cbaee2784..95b7aab0a223 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6fca2e93c9ad3c704f02aaabe4359a8af16fbbb
+refs/heads/master: a435869cacbb581920df23411416bed533748bf1
diff --git a/trunk/sound/soc/pxa/zylonite.c b/trunk/sound/soc/pxa/zylonite.c
index 8541b679f6eb..ec2fb764b241 100644
--- a/trunk/sound/soc/pxa/zylonite.c
+++ b/trunk/sound/soc/pxa/zylonite.c
@@ -95,6 +95,7 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
 	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+	unsigned int pll_out = 0;
 	unsigned int acds = 0;
 	unsigned int wm9713_div = 0;
 	int ret = 0;
@@ -102,13 +103,16 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
 	switch (params_rate(params)) {
 	case 8000:
 		wm9713_div = 12;
+		pll_out = 2048000;
 		break;
 	case 16000:
 		wm9713_div = 6;
+		pll_out = 4096000;
 		break;
 	case 48000:
 	default:
 		wm9713_div = 2;
+		pll_out = 12288000;
 		acds = 1;
 		break;
 	}
@@ -129,6 +133,10 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
 	if (ret < 0)
 		return ret;
 
+	ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, pll_out);
+	if (ret < 0)
+		return ret;
+
 	ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_AUDIO_DIV_ACDS, acds);
 	if (ret < 0)
 		return ret;