summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/arizona.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-13 21:34:01 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-13 21:34:01 +0900
commitf48aa392219a22655417aa0e2d6889291e934c45 (patch)
tree54d15e58870b2e2a3b3dad5de9b6b4d0a7d0af86 /sound/soc/codecs/arizona.c
parentd37fb92326da880947d4dd72684ef1dd2d245727 (diff)
parent7d5cb4f7105e7cf12e58e6df5af0cbdb11060bca (diff)
downloadlinux-f48aa392219a22655417aa0e2d6889291e934c45.tar.bz2
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-arizona
Diffstat (limited to 'sound/soc/codecs/arizona.c')
-rw-r--r--sound/soc/codecs/arizona.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 6d98cf41f727..f919a3ae2887 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);