diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 21:34:01 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 21:34:01 +0900 |
| commit | f48aa392219a22655417aa0e2d6889291e934c45 (patch) | |
| tree | 54d15e58870b2e2a3b3dad5de9b6b4d0a7d0af86 | |
| parent | d37fb92326da880947d4dd72684ef1dd2d245727 (diff) | |
| parent | 7d5cb4f7105e7cf12e58e6df5af0cbdb11060bca (diff) | |
| download | op-kernel-dev-f48aa392219a22655417aa0e2d6889291e934c45.zip op-kernel-dev-f48aa392219a22655417aa0e2d6889291e934c45.tar.gz | |
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
| -rw-r--r-- | sound/soc/codecs/arizona.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wm5102.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 6d98cf4..f919a3a 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1172,6 +1172,9 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, id, ret); } + regmap_update_bits(arizona->regmap, fll->base + 1, + ARIZONA_FLL1_FREERUN, 0); + return 0; } EXPORT_SYMBOL_GPL(arizona_init_fll); diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 803d6db..2adcfba 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -948,8 +948,7 @@ static const unsigned int wm5102_aec_loopback_values[] = { static const struct soc_enum wm5102_aec_loopback = SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, - ARIZONA_AEC_LOOPBACK_SRC_SHIFT, - ARIZONA_AEC_LOOPBACK_SRC_MASK, + ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf, ARRAY_SIZE(wm5102_aec_loopback_texts), wm5102_aec_loopback_texts, wm5102_aec_loopback_values); diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 8f7081e..2319937 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -393,8 +393,7 @@ static const unsigned int wm5110_aec_loopback_values[] = { static const struct soc_enum wm5110_aec_loopback = SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, - ARIZONA_AEC_LOOPBACK_SRC_SHIFT, - ARIZONA_AEC_LOOPBACK_SRC_MASK, + ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf, ARRAY_SIZE(wm5110_aec_loopback_texts), wm5110_aec_loopback_texts, wm5110_aec_loopback_values); |
