summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2009-02-03 14:52:56 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-03 18:12:16 +0100
commit111f6fbeb73fc350fe3a08c4ecd0ccdf3e13bef0 (patch)
tree058a50ef01c8974238c5c3a7931b50eac6fe5718
parentMerge branch 'fix/asoc' into topic/asoc (diff)
downloadlinux-111f6fbeb73fc350fe3a08c4ecd0ccdf3e13bef0.tar.xz
linux-111f6fbeb73fc350fe3a08c4ecd0ccdf3e13bef0.zip
ASoC: Don't unconditionally use the PLL in UDA1380
Without this fix driver switches to WSPLL in uda1380_pcm_prepare even if SYSCLK was chosen (uda1380_pcm_prepare modifies UDA1380_CLK register to disable R00_DAC_CLK before flushing reg cache) Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/uda1380.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 98e4a6560f06..6e4a1770ce8d 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -418,8 +418,8 @@ static int uda1380_pcm_prepare(struct snd_pcm_substream *substream,
uda1380_write(codec, reg, uda1380_read_reg_cache(codec, reg));
}
- /* FIXME enable DAC_CLK */
- uda1380_write(codec, UDA1380_CLK, clk | R00_DAC_CLK);
+ /* FIXME restore DAC_CLK */
+ uda1380_write(codec, UDA1380_CLK, clk);
return 0;
}