diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-23 08:22:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-23 08:22:58 +0100 |
| commit | c30853df9834bccc2841798b0ab8f151929ae500 (patch) | |
| tree | 32bd460288bcd24c3d6ad6fc60da53ef48265845 /sound/soc | |
| parent | d756b2774829c746e0cf2967802cbd41967eda65 (diff) | |
| parent | 06c71282a90470184a78f7f0ab0f7ce0fc1f69c8 (diff) | |
| download | linux-c30853df9834bccc2841798b0ab8f151929ae500.tar.gz linux-c30853df9834bccc2841798b0ab8f151929ae500.tar.bz2 linux-c30853df9834bccc2841798b0ab8f151929ae500.zip | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index ab099f482487..cb0d1bf34b57 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 */ |