ASoC: kirkwood: prefer external clock over internal clock
authorJean-Francois Moine <moinejf@free.fr>
Fri, 18 Oct 2013 18:34:52 +0000 (20:34 +0200)
committerMark Brown <broonie@linaro.org>
Sun, 20 Oct 2013 16:29:27 +0000 (17:29 +0100)
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>
sound/soc/kirkwood/kirkwood-i2s.c

index 3e59af983527ad1d58055d0a51465f80cc7196b8..d0504a2d8c6320d67a7ad8f0dab6b22bcef51548 100644 (file)
@@ -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",