Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic...

diff --cc sound/soc/atmel/atmel-pdmic.c
Simple merge

diff --cc sound/soc/codecs/ak4104.c
Simple merge

diff --cc sound/soc/codecs/arizona.c
index ded235f3090fcb4e0ca2fae0da0911768ba9d885,ecfdbfcae366cf5840e40b1c847d9bc6d56ba4e4,ecfdbfcae366cf5840e40b1c847d9bc6d56ba4e4,85584ecf95bb80b2f5606e0dd816062b673445ac,ecfdbfcae366cf5840e40b1c847d9bc6d56ba4e4,ecfdbfcae366cf5840e40b1c847d9bc6d56ba4e4..846ca079845fa8d141411e6944f369e904e95b61
--- 1/sound/soc/codecs/arizona.c
--- 2/sound/soc/codecs/arizona.c
--- 3/sound/soc/codecs/arizona.c
--- 4/sound/soc/codecs/arizona.c
--- 5/sound/soc/codecs/arizona.c
--- 6/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,

diff --cc sound/soc/codecs/cs47l24.c
Simple merge

diff --cc sound/soc/codecs/da7213.c
Simple merge

diff --cc sound/soc/codecs/da7219.c
Simple merge

diff --cc sound/soc/codecs/nau8825.c
Simple merge

diff --cc sound/soc/codecs/rt5514.c
Simple merge

diff --cc sound/soc/codecs/rt5640.c
Simple merge

diff --cc sound/soc/codecs/wm2000.c
Simple merge

diff --cc sound/soc/codecs/wm5102.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge

diff --cc sound/soc/codecs/wm8998.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge