diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 09:45:07 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 09:45:07 (GMT) |
| commit | 15d47763b354256053c390a9b7bc9f2b4f197711 (patch) | |
| tree | 6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed /sound/soc/codecs | |
| parent | 0ff97ebf0804d2e519d578fcb4db03f104d2ca8c (diff) | |
| parent | d66a547cddb9124cea6308c33e1f54c7c8db288f (diff) | |
| download | linux-15d47763b354256053c390a9b7bc9f2b4f197711.tar.xz | |
Merge branch 'for-3.5' into for-3.6
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.h | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b94f81f..dc78f5a 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -965,9 +965,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, } found: - data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); - snd_soc_write(codec, AIC3X_PLL_PROGA_REG, - data | (pll_p << PLLP_SHIFT)); + snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG, PLLP_MASK, pll_p); snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, pll_r << PLLR_SHIFT); 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 149338b..6db3c41 100644 --- a/sound/soc/codecs/tlv320aic3x.h +++ b/sound/soc/codecs/tlv320aic3x.h @@ -183,6 +183,7 @@ /* PLL registers bitfields */ #define PLLP_SHIFT 0 +#define PLLP_MASK 7 #define PLLQ_SHIFT 3 #define PLLR_SHIFT 0 #define PLLJ_SHIFT 2 diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index acbdc5f..32682c1 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1491,6 +1491,7 @@ static int wm2200_bclk_rates_dat[WM2200_NUM_BCLK_RATES] = { static int wm2200_bclk_rates_cd[WM2200_NUM_BCLK_RATES] = { 5644800, + 3763200, 2882400, 1881600, 1411200, diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 6576338..bb62f4b 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -727,9 +727,6 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode) if (!wm8994->jackdet || !wm8994->jack_cb) return; - if (!wm8994->jackdet || !wm8994->jack_cb) - return; - if (wm8994->active_refcount) mode = WM1811_JACKDET_MODE_AUDIO; |