Commit c47ccb2e authored by Takashi Iwai's avatar Takashi Iwai

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
...@@ -935,9 +935,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, ...@@ -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);
......
...@@ -166,6 +166,7 @@ ...@@ -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
......
...@@ -1491,6 +1491,7 @@ static int wm2200_bclk_rates_dat[WM2200_NUM_BCLK_RATES] = { ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment