diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-25 18:44:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-26 11:48:54 +0100 |
| commit | 92a4352cdb53443ea5cb8bafd018e69933edb0a5 (patch) | |
| tree | bf2f7031ed4fe2cddf097306f41b0c29ca6389f8 | |
| parent | 3b8a6d80e5d02a827d882935b96c1c3c3b56c977 (diff) | |
| download | kernel_samsung_smdk4412-92a4352cdb53443ea5cb8bafd018e69933edb0a5.zip kernel_samsung_smdk4412-92a4352cdb53443ea5cb8bafd018e69933edb0a5.tar.gz kernel_samsung_smdk4412-92a4352cdb53443ea5cb8bafd018e69933edb0a5.tar.bz2 | |
ASoC: Move WM8962 FLL configuration to CODEC
There's only one DAI anyway.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index d6b78b2..549018e 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3173,10 +3173,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, return 0; } -static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source, +static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, unsigned int Fref, unsigned int Fout) { - struct snd_soc_codec *codec = dai->codec; struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct _fll_div fll_div; unsigned long timeout; @@ -3281,7 +3280,6 @@ static struct snd_soc_dai_ops wm8962_dai_ops = { .hw_params = wm8962_hw_params, .set_sysclk = wm8962_set_dai_sysclk, .set_fmt = wm8962_set_dai_fmt, - .set_pll = wm8962_set_fll, .digital_mute = wm8962_mute, }; @@ -3932,6 +3930,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { .reg_cache_default = wm8962_reg, .volatile_register = wm8962_volatile_register, .readable_register = wm8962_readable_register, + .set_pll = wm8962_set_fll, }; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |