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

diff --combined sound/soc/soc-core.c
index b9ca939fd05c302eb5853b63c1102c2e3461faf3,9047046c749ca9e99df6c9e1f0c634cc77e3369f..724b35671aa6b7ebdfb3faf98af7d1013430c67c
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -213,7 -213,7 +213,7 @@@ static umode_t soc_dev_attr_is_visible(
  
        if (attr == &dev_attr_pmdown_time.attr)
                return attr->mode; /* always visible */
 -      return rtd->codec ? attr->mode : 0; /* enabled only with codec */
 +      return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */
  }
  
  static const struct attribute_group soc_dapm_dev_group = {
@@@ -1392,6 -1392,16 +1392,16 @@@ static int soc_init_dai_link(struct snd
        return 0;
  }
  
+ void snd_soc_disconnect_sync(struct device *dev)
+ {
+       struct snd_soc_component *component = snd_soc_lookup_component(dev, NULL);
+ 
+       if (!component || !component->card)
+               return;
+ 
+       snd_card_disconnect_sync(component->card->snd_card);
+ }
+ 
  /**
   * snd_soc_add_dai_link - Add a DAI link dynamically
   * @card: The ASoC card to which the DAI link is added
@@@ -1945,9 -1955,7 +1955,9 @@@ int snd_soc_runtime_set_dai_fmt(struct 
        }
  
        /* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */
 -      if (cpu_dai->codec) {
 +      /* the component which has non_legacy_dai_naming is Codec */
 +      if (cpu_dai->codec ||
 +          cpu_dai->component->driver->non_legacy_dai_naming) {
                unsigned int inv_dai_fmt;
  
                inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;