openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/arizona' into tmp

This commit is contained in:
Mark Brown 2013-01-22 16:26:06 +08:00
parent a4cdbec758 b59e0f82aa
commit bc04c93bbc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/arizona.c
View File

@ -685,7 +685,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
} }
sr_val = i; sr_val = i;
lrclk = snd_soc_params_to_bclk(params) / params_rate(params); lrclk = rates[bclk] / params_rate(params);
arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n", arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
rates[bclk], rates[bclk] / lrclk); rates[bclk], rates[bclk] / lrclk);
@ -1082,6 +1082,9 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
id, ret); id, ret);
} }
regmap_update_bits(arizona->regmap, fll->base + 1,
ARIZONA_FLL1_FREERUN, 0);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(arizona_init_fll); EXPORT_SYMBOL_GPL(arizona_init_fll);

3
sound/soc/codecs/wm5102.c
View File

@ -896,8 +896,7 @@ static const unsigned int wm5102_aec_loopback_values[] = {
static const struct soc_enum wm5102_aec_loopback = static const struct soc_enum wm5102_aec_loopback =
SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_SRC_SHIFT, ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
ARIZONA_AEC_LOOPBACK_SRC_MASK,
ARRAY_SIZE(wm5102_aec_loopback_texts), ARRAY_SIZE(wm5102_aec_loopback_texts),
wm5102_aec_loopback_texts, wm5102_aec_loopback_texts,
wm5102_aec_loopback_values); wm5102_aec_loopback_values);

3
sound/soc/codecs/wm5110.c
View File

@ -344,8 +344,7 @@ static const unsigned int wm5110_aec_loopback_values[] = {
static const struct soc_enum wm5110_aec_loopback = static const struct soc_enum wm5110_aec_loopback =
SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_SRC_SHIFT, ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,
ARIZONA_AEC_LOOPBACK_SRC_MASK,
ARRAY_SIZE(wm5110_aec_loopback_texts), ARRAY_SIZE(wm5110_aec_loopback_texts),
wm5110_aec_loopback_texts, wm5110_aec_loopback_texts,
wm5110_aec_loopback_values); wm5110_aec_loopback_values);