diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-21 15:07:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-21 15:07:44 +0100 |
| commit | ee71a70e95e4a01be17cf4dfe0339f9774bb5927 (patch) | |
| tree | d10ce27c2a3cfee5332a91275f5426640d3bdc4b /sound/soc/codecs/arizona.c | |
| parent | ALSA: hda - Add headset quirk for Dell Inspiron 3135 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus (diff) | |
| download | linux-ee71a70e95e4a01be17cf4dfe0339f9774bb5927.tar.xz linux-ee71a70e95e4a01be17cf4dfe0339f9774bb5927.zip | |
Merge tag 'asoc-v3.13-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A bunch of device specific fixes, nothing with a general impact here.
Diffstat (limited to 'sound/soc/codecs/arizona.c')
| -rw-r--r-- | sound/soc/codecs/arizona.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 6f05b17d1965..fea991031be1 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -1529,6 +1529,8 @@ static void arizona_enable_fll(struct arizona_fll *fll, try_wait_for_completion(&fll->ok); regmap_update_bits(arizona->regmap, fll->base + 1, + ARIZONA_FLL1_FREERUN, 0); + regmap_update_bits(arizona->regmap, fll->base + 1, ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA); if (use_sync) regmap_update_bits(arizona->regmap, fll->base + 0x11, @@ -1546,6 +1548,8 @@ static void arizona_disable_fll(struct arizona_fll *fll) struct arizona *arizona = fll->arizona; bool change; + regmap_update_bits(arizona->regmap, fll->base + 1, + ARIZONA_FLL1_FREERUN, ARIZONA_FLL1_FREERUN); regmap_update_bits_check(arizona->regmap, fll->base + 1, ARIZONA_FLL1_ENA, 0, &change); regmap_update_bits(arizona->regmap, fll->base + 0x11, |