lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Browse Source 
ASoC: Updates for 3.5

A couple of unexciting driver specific changes.
This commit is contained in:
Takashi Iwai
2012-06-29 09:33:40 +02:00
parent 6e1c39c6b0 c9fe573a65
commit c47ccb2e80
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/tlv320aic3x.c
View File

@@ -935,9 +935,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
} }
found: found:
data = snd_soc_read(codec, AIC3X_PLL_PROGA_REG); snd_soc_update_bits(codec, AIC3X_PLL_PROGA_REG, PLLP_MASK, pll_p);
snd_soc_write(codec, AIC3X_PLL_PROGA_REG,
data | (pll_p << PLLP_SHIFT));
snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG, snd_soc_write(codec, AIC3X_OVRF_STATUS_AND_PLLR_REG,
pll_r << PLLR_SHIFT); pll_r << PLLR_SHIFT);
snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT); snd_soc_write(codec, AIC3X_PLL_PROGB_REG, pll_j << PLLJ_SHIFT);

1
sound/soc/codecs/tlv320aic3x.h
View File

@@ -166,6 +166,7 @@
/* PLL registers bitfields */ /* PLL registers bitfields */
#define PLLP_SHIFT 0 #define PLLP_SHIFT 0
#define PLLP_MASK 7
#define PLLQ_SHIFT 3 #define PLLQ_SHIFT 3
#define PLLR_SHIFT 0 #define PLLR_SHIFT 0
#define PLLJ_SHIFT 2 #define PLLJ_SHIFT 2

1
sound/soc/codecs/wm2200.c
View File

@@ -1491,6 +1491,7 @@ static int wm2200_bclk_rates_dat[WM2200_NUM_BCLK_RATES] = {
static int wm2200_bclk_rates_cd[WM2200_NUM_BCLK_RATES] = { static int wm2200_bclk_rates_cd[WM2200_NUM_BCLK_RATES] = {
5644800, 5644800,
3763200,
2882400, 2882400,
1881600, 1881600,
1411200, 1411200,