Commit c47ccb2e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

ASoC: Updates for 3.5

A couple of unexciting driver specific changes.
parents 6e1c39c6 c9fe573a

sound/soc/codecs/tlv320aic3x.c

+1 −3
Original line number Diff line number Diff line
@@ -935,9 +935,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);

sound/soc/codecs/tlv320aic3x.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 


/* PLL registers bitfields */

#define PLLP_SHIFT		0

#define PLLP_MASK		7

#define PLLQ_SHIFT		3

#define PLLR_SHIFT		0

#define PLLJ_SHIFT		2

sound/soc/codecs/wm2200.c

+1 −0
Original line number Diff line number Diff line
@@ -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,