Merge remote-tracking branch 'asoc/topic/dt' into asoc-next

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/soc-core.c
index ea8a647edeb059de486fd7788a9b12cc33fc84cc,199eb51d46144725628742ddb1295dcd5e822e0c..f6f24aff1cba12d25f59133e56928c3cba395145
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1594,14 -1541,10 +1596,15 @@@ static void soc_unregister_ac97_codec(s
                codec->ac97_registered = 0;
        }
  }
 +
 +static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
 +{
 +      soc_unregister_ac97_codec(rtd->codec);
 +}
  #endif
  
- static int soc_check_aux_dev(struct snd_soc_card *card, int num)
+ static struct snd_soc_codec *soc_find_matching_codec(struct snd_soc_card *card,
+       int num)
  {
        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
        struct snd_soc_codec *codec;