summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-26 09:07:03 (GMT)
committerTakashi Iwai <tiwai@suse.de>2009-07-26 09:07:03 (GMT)
commit7679d5c65ba8e4d27daa9181c2f4c7e618058f29 (patch)
tree2740ba29fd47b6a0f5cf70b5103a9db6fe622dfb /sound
parent4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff)
parent06c71282a90470184a78f7f0ab0f7ce0fc1f69c8 (diff)
downloadlinux-7679d5c65ba8e4d27daa9181c2f4c7e618058f29.tar.xz
Merge branch 'fix/asoc' into for-linus
* fix/asoc: ASoC: tlv320aic3x: Enable PLL when not bypassed
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index ab099f4..cb0d1bf 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -767,6 +767,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
int codec_clk = 0, bypass_pll = 0, fsref, last_clk = 0;
u8 data, r, p, pll_q, pll_p = 1, pll_r = 1, pll_j = 1;
u16 pll_d = 1;
+ u8 reg;
/* select data word length */
data =
@@ -801,8 +802,16 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
pll_q &= 0xf;
aic3x_write(codec, AIC3X_PLL_PROGA_REG, pll_q << PLLQ_SHIFT);
aic3x_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_CLKDIV);
- } else
+ /* disable PLL if it is bypassed */
+ reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
+ aic3x_write(codec, AIC3X_PLL_PROGA_REG, reg & ~PLL_ENABLE);
+
+ } else {
aic3x_write(codec, AIC3X_GPIOB_REG, CODEC_CLKIN_PLLDIV);
+ /* enable PLL when it is used */
+ reg = aic3x_read_reg_cache(codec, AIC3X_PLL_PROGA_REG);
+ aic3x_write(codec, AIC3X_PLL_PROGA_REG, reg | PLL_ENABLE);
+ }
/* Route Left DAC to left channel input and
* right DAC to right channel input */