diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-12 02:39:10 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-13 12:52:52 -0400 |
commit | 01b07e2d84c887b432353ead846f4497a33b5f5d (patch) | |
tree | bc28637684a834b0c8195bca3a33fcc614987990 | |
parent | 420dd718ad0bc4a4e07ae0ac7f8eac7545eb253a (diff) |
ASoC: Move WM8915 FLL operations onto the CODEC
Since the WM8915 FLL is not tied to a particular audio interface move it
to a CODEC wide operation.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r-- | sound/soc/codecs/wm8915.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c index 3adad2872c7e..083609418bf4 100644 --- a/sound/soc/codecs/wm8915.c +++ b/sound/soc/codecs/wm8915.c | |||
@@ -1997,10 +1997,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, | |||
1997 | return 0; | 1997 | return 0; |
1998 | } | 1998 | } |
1999 | 1999 | ||
2000 | static int wm8915_set_fll(struct snd_soc_dai *dai, int fll_id, int source, | 2000 | static int wm8915_set_fll(struct snd_soc_codec *codec, int fll_id, int source, |
2001 | unsigned int Fref, unsigned int Fout) | 2001 | unsigned int Fref, unsigned int Fout) |
2002 | { | 2002 | { |
2003 | struct snd_soc_codec *codec = dai->codec; | ||
2004 | struct wm8915_priv *wm8915 = snd_soc_codec_get_drvdata(codec); | 2003 | struct wm8915_priv *wm8915 = snd_soc_codec_get_drvdata(codec); |
2005 | struct _fll_div fll_div; | 2004 | struct _fll_div fll_div; |
2006 | unsigned long timeout; | 2005 | unsigned long timeout; |
@@ -2776,6 +2775,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8915 = { | |||
2776 | .num_dapm_widgets = ARRAY_SIZE(wm8915_dapm_widgets), | 2775 | .num_dapm_widgets = ARRAY_SIZE(wm8915_dapm_widgets), |
2777 | .dapm_routes = wm8915_dapm_routes, | 2776 | .dapm_routes = wm8915_dapm_routes, |
2778 | .num_dapm_routes = ARRAY_SIZE(wm8915_dapm_routes), | 2777 | .num_dapm_routes = ARRAY_SIZE(wm8915_dapm_routes), |
2778 | .set_pll = wm8915_set_fll, | ||
2779 | }; | 2779 | }; |
2780 | 2780 | ||
2781 | #define WM8915_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ | 2781 | #define WM8915_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ |
@@ -2788,7 +2788,6 @@ static struct snd_soc_dai_ops wm8915_dai_ops = { | |||
2788 | .set_fmt = wm8915_set_fmt, | 2788 | .set_fmt = wm8915_set_fmt, |
2789 | .hw_params = wm8915_hw_params, | 2789 | .hw_params = wm8915_hw_params, |
2790 | .set_sysclk = wm8915_set_sysclk, | 2790 | .set_sysclk = wm8915_set_sysclk, |
2791 | .set_pll = wm8915_set_fll, | ||
2792 | }; | 2791 | }; |
2793 | 2792 | ||
2794 | static struct snd_soc_dai_driver wm8915_dai[] = { | 2793 | static struct snd_soc_dai_driver wm8915_dai[] = { |