>From e07ea80f6d8bbac6ab20b525a0c37269eb6bb741 Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Sun, 1 Jun 2008 14:49:31 +0200 Subject: [PATCH] Revert "wm9713: Expose the PLL configuration" This reverts commit 0d03f161680832984dd03f6bfc9a3423fc67501d. There's a bug in set_pll call from resume function. --- sound/soc/codecs/wm9713.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 5defac8..eae042c 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -659,7 +659,7 @@ struct pll_ { unsigned int k; }; -static struct pll_ pll[] = { +struct pll_ pll[] = { {13000000, 0, 1, 0, 0, 7, 0x23f488}, {2048000, 1, 0, 0, 0, 12, 0x0}, {4096000, 1, 0, 0, 0, 6, 0x0}, @@ -667,10 +667,9 @@ static struct pll_ pll[] = { /* liam - add more entries */ }; -static int wm9713_set_pll(struct snd_soc_dai *codec_dai, +static int wm9713_set_pll(struct snd_soc_codec *codec, int pll_id, unsigned int freq_in, unsigned int freq_out) { - struct snd_soc_codec *codec = codec_dai->codec; struct wm9713_data *wm9713 = codec->private_data; int i; u16 reg, reg2; @@ -1056,13 +1055,11 @@ static struct snd_soc_dai_caps wm9713_voice_playback = { static struct snd_soc_dai_ops wm9713_hifi_dai_ops = { /* alsa ops */ .prepare = ac97_hifi_prepare, - .set_pll = wm9713_set_pll, }; static struct snd_soc_dai_ops wm9713_aux_dai_ops = { /* alsa ops */ .prepare = ac97_aux_prepare, - .set_pll = wm9713_set_pll, }; static struct snd_soc_dai_ops wm9713_voice_dai_ops = { @@ -1074,7 +1071,6 @@ static struct snd_soc_dai_ops wm9713_voice_dai_ops = { .set_clkdiv = wm9713_set_dai_clkdiv, .set_fmt = wm9713_set_dai_fmt, .set_tristate = wm9713_set_dai_tristate, - .set_pll = wm9713_set_pll, }; /* for modprobe */ -- 1.5.5.3