瀏覽代碼

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>
Jean-Francois Moine 11 年之前
父節點
當前提交
1f1b65796e
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      sound/soc/kirkwood/kirkwood-i2s.c

+ 1 - 1
sound/soc/kirkwood/kirkwood-i2s.c

@@ -103,7 +103,7 @@ static void kirkwood_set_rate(struct snd_soc_dai *dai,
 {
 {
 	uint32_t clks_ctrl;
 	uint32_t clks_ctrl;
 
 
-	if (rate == 44100 || rate == 48000 || rate == 96000) {
+	if (IS_ERR(priv->extclk)) {
 		/* use internal dco for the supported rates
 		/* use internal dco for the supported rates
 		 * defined in kirkwood_i2s_dai */
 		 * defined in kirkwood_i2s_dai */
 		dev_dbg(dai->dev, "%s: dco set rate = %lu\n",
 		dev_dbg(dai->dev, "%s: dco set rate = %lu\n",