summaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2013-10-18 20:34:52 +0200
committerMark Brown <broonie@linaro.org>2013-10-20 17:29:27 +0100
commit1f1b65796ef882bb9101d22b17e1a1824b3a6489 (patch)
tree1d719fc1b51602b359c1ed5f386054b0cbbf4946 /sound/soc/kirkwood
parente2c9917bfa4e104ba53819b37498eb45fbcd4e41 (diff)
downloadop-kernel-dev-1f1b65796ef882bb9101d22b17e1a1824b3a6489.zip
op-kernel-dev-1f1b65796ef882bb9101d22b17e1a1824b3a6489.tar.gz
ASoC: kirkwood: prefer external clock over internal clock
When there is an external clock, always use this one. This prevents the two Dove audio devices to use the same DCO clock at different rates. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 3e59af9..d0504a2 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -103,7 +103,7 @@ static void kirkwood_set_rate(struct snd_soc_dai *dai,
{
uint32_t clks_ctrl;
- if (rate == 44100 || rate == 48000 || rate == 96000) {
+ if (IS_ERR(priv->extclk)) {
/* use internal dco for the supported rates
* defined in kirkwood_i2s_dai */
dev_dbg(dai->dev, "%s: dco set rate = %lu\n",
OpenPOWER on IntegriCloud