From: Mark Brown <broonie@kernel.org>
Date: Thu, 29 Sep 2016 19:44:07 +0000 (-0700)
Subject: Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7c90fc73bf78aa1f390c65f86a43ffae543a248d;p=linux.git

Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/codec-component' into asoc-next
---

7c90fc73bf78aa1f390c65f86a43ffae543a248d
diff --cc sound/soc/codecs/arizona.c
index ded235f3090fc,ecfdbfcae366c,ecfdbfcae366c,85584ecf95bb8,ecfdbfcae366c,ecfdbfcae366c..846ca079845fa
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@@@@@@ -2272,10 -2268,10 -2268,10 -2312,8 -2268,10 -2268,10 +2316,8 @@@@@@@ static int arizona_enable_fll(struct ar
      					 ARIZONA_FLL1_SYNC_BW);
      
      	if (!already_enabled)
 -----		pm_runtime_get(arizona->dev);
 +++++		pm_runtime_get_sync(arizona->dev);
      
--- --	regmap_update_bits_async(arizona->regmap, fll->base + 1,
--- --				 ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
      	if (use_sync)
      		regmap_update_bits_async(arizona->regmap, fll->base + 0x11,
      					 ARIZONA_FLL1_SYNC_ENA,