diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic3x.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 64d2a4fa34b2..e9b62b5ea637 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
@@ -935,9 +935,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, | |||
935 | } | 935 | } |
936 | 936 | ||
937 | found: | 937 | found: |
938 | data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); | 938 | snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG, PLLP_MASK, pll_p); |
939 | snd_soc_write(codec, AIC3X_PLL_PROGA_REG, | ||
940 | data | (pll_p << PLLP_SHIFT)); | ||
941 | snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, | 939 | snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, |
942 | pll_r << PLLR_SHIFT); | 940 | pll_r << PLLR_SHIFT); |
943 | snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); | 941 | snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); |
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h index 6f097fb60683..08c7f6685ff0 100644 --- a/sound/soc/codecs/tlv320aic3x.h +++ b/sound/soc/codecs/tlv320aic3x.h | |||
@@ -166,6 +166,7 @@ | |||
166 | 166 | ||
167 | /* PLL registers bitfields */ | 167 | /* PLL registers bitfields */ |
168 | #define PLLP_SHIFT 0 | 168 | #define PLLP_SHIFT 0 |
169 | #define PLLP_MASK 7 | ||
169 | #define PLLQ_SHIFT 3 | 170 | #define PLLQ_SHIFT 3 |
170 | #define PLLR_SHIFT 0 | 171 | #define PLLR_SHIFT 0 |
171 | #define PLLJ_SHIFT 2 | 172 | #define PLLJ_SHIFT 2 |