aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8962.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-25 13:44:01 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-26 06:48:54 -0400
commit92a4352cdb53443ea5cb8bafd018e69933edb0a5 (patch)
treebf2f7031ed4fe2cddf097306f41b0c29ca6389f8 /sound/soc/codecs/wm8962.c
parent3b8a6d80e5d02a827d882935b96c1c3c3b56c977 (diff)
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>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-rw-r--r--sound/soc/codecs/wm8962.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index d6b78b2a10df..549018e46233 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,
3173 return 0; 3173 return 0;
3174} 3174}
3175 3175
3176static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source, 3176static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
3177 unsigned int Fref, unsigned int Fout) 3177 unsigned int Fref, unsigned int Fout)
3178{ 3178{
3179 struct snd_soc_codec *codec = dai->codec;
3180 struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); 3179 struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
3181 struct _fll_div fll_div; 3180 struct _fll_div fll_div;
3182 unsigned long timeout; 3181 unsigned long timeout;
@@ -3281,7 +3280,6 @@ static struct snd_soc_dai_ops wm8962_dai_ops = {
3281 .hw_params = wm8962_hw_params, 3280 .hw_params = wm8962_hw_params,
3282 .set_sysclk = wm8962_set_dai_sysclk, 3281 .set_sysclk = wm8962_set_dai_sysclk,
3283 .set_fmt = wm8962_set_dai_fmt, 3282 .set_fmt = wm8962_set_dai_fmt,
3284 .set_pll = wm8962_set_fll,
3285 .digital_mute = wm8962_mute, 3283 .digital_mute = wm8962_mute,
3286}; 3284};
3287 3285
@@ -3932,6 +3930,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8962 = {
3932 .reg_cache_default = wm8962_reg, 3930 .reg_cache_default = wm8962_reg,
3933 .volatile_register = wm8962_volatile_register, 3931 .volatile_register = wm8962_volatile_register,
3934 .readable_register = wm8962_readable_register, 3932 .readable_register = wm8962_readable_register,
3933 .set_pll = wm8962_set_fll,
3935}; 3934};
3936 3935
3937#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 3936#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)