diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-05 13:52:16 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-05 13:52:16 -0400 |
commit | 85488037bb9b533b064be66412dbe1dbcd2734d9 (patch) | |
tree | 844445f441b716130aaa4ba08d02a8ec3ba04e72 /sound/soc/pxa/zylonite.c | |
parent | 367da1527aff2a4f789d03082f9fb191cdf332c4 (diff) |
ASoC: Add source argument to PLL configuration
More and more devices feature PLLs and FLLs with the ability to select
between multiple input clocks. In order to better support these devices
a new argument, source, has been added to the set_pll() configuration
API. Using set_clkdiv() is often difficult due to the need to stop the
PLL/FLL before any reconfiguration can be done.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/zylonite.c')
-rw-r--r-- | sound/soc/pxa/zylonite.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index 9a386b4c4ed1..dd678ae24398 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c | |||
@@ -74,7 +74,8 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
74 | static int zylonite_wm9713_init(struct snd_soc_codec *codec) | 74 | static int zylonite_wm9713_init(struct snd_soc_codec *codec) |
75 | { | 75 | { |
76 | if (clk_pout) | 76 | if (clk_pout) |
77 | snd_soc_dai_set_pll(&codec->dai[0], 0, clk_get_rate(pout), 0); | 77 | snd_soc_dai_set_pll(&codec->dai[0], 0, 0, |
78 | clk_get_rate(pout), 0); | ||
78 | 79 | ||
79 | snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets, | 80 | snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets, |
80 | ARRAY_SIZE(zylonite_dapm_widgets)); | 81 | ARRAY_SIZE(zylonite_dapm_widgets)); |
@@ -128,7 +129,7 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream, | |||
128 | if (ret < 0) | 129 | if (ret < 0) |
129 | return ret; | 130 | return ret; |
130 | 131 | ||
131 | ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, pll_out); | 132 | ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, pll_out); |
132 | if (ret < 0) | 133 | if (ret < 0) |
133 | return ret; | 134 | return ret; |
134 | 135 | ||