ASoC: Move WM8962 FLL configuration to CODEC
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Apr 2011 17:44:01 +0000 (18:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Apr 2011 10:48:54 +0000 (11:48 +0100)
There's only one DAI anyway.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/codecs/wm8962.c

index d6b78b2a10dfc0a5bd52fa17c9dce93482ba23e5..549018e462335e7e52f28ec5d9f418d1e590689e 100644 (file)
@@ -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)