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

diff --combined sound/soc/soc-dapm.c
index 258acadb9e7d238a97b7af6508ffc21bd1a4488e,4d664f3df805c3e89261154303fd5219098c02fc..1d6a9b3ceb27cc0b9a6ea307faecaf5872d6b6c9
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -1023,7 -1023,7 +1023,7 @@@ int dapm_regulator_event(struct snd_soc
  
        if (SND_SOC_DAPM_EVENT_ON(event)) {
                if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) {
 -                      ret = regulator_allow_bypass(w->regulator, true);
 +                      ret = regulator_allow_bypass(w->regulator, false);
                        if (ret != 0)
                                dev_warn(w->dapm->dev,
                                         "ASoC: Failed to bypass %s: %d\n",
@@@ -1033,7 -1033,7 +1033,7 @@@
                return regulator_enable(w->regulator);
        } else {
                if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) {
 -                      ret = regulator_allow_bypass(w->regulator, false);
 +                      ret = regulator_allow_bypass(w->regulator, true);
                        if (ret != 0)
                                dev_warn(w->dapm->dev,
                                         "ASoC: Failed to unbypass %s: %d\n",
@@@ -3039,14 -3039,6 +3039,14 @@@ snd_soc_dapm_new_control(struct snd_soc
                                w->name, ret);
                        return NULL;
                }
 +
 +              if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) {
 +                      ret = regulator_allow_bypass(w->regulator, true);
 +                      if (ret != 0)
 +                              dev_warn(w->dapm->dev,
 +                                       "ASoC: Failed to unbypass %s: %d\n",
 +                                       w->name, ret);
 +              }
                break;
        case snd_soc_dapm_clock_supply:
  #ifdef CONFIG_CLKDEV_LOOKUP
@@@ -3255,14 -3247,16 +3255,16 @@@ static int snd_soc_dai_link_event(struc
                break;
  
        case SND_SOC_DAPM_POST_PMU:
-               ret = snd_soc_dai_digital_mute(sink, 0);
+               ret = snd_soc_dai_digital_mute(sink, 0,
+                                              SNDRV_PCM_STREAM_PLAYBACK);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret);
                ret = 0;
                break;
  
        case SND_SOC_DAPM_PRE_PMD:
-               ret = snd_soc_dai_digital_mute(sink, 1);
+               ret = snd_soc_dai_digital_mute(sink, 1,
+                                              SNDRV_PCM_STREAM_PLAYBACK);
                if (ret != 0 && ret != -ENOTSUPP)
                        dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret);
                ret = 0;