Merge branch 'for-linus' into for-next

36 files changed, 265 insertions, 619 deletions

diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c
index 023cc4cad5c1..626f3bb24c55 100644
--- a/sound/hda/ext/hdac_ext_stream.c
+++ b/sound/hda/ext/hdac_ext_stream.c
@@ -104,12 +104,11 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_init_all);
  */
 void snd_hdac_stream_free_all(struct hdac_ext_bus *ebus)
 {
-        struct hdac_stream *s;
+        struct hdac_stream *s, *_s;
         struct hdac_ext_stream *stream;
         struct hdac_bus *bus = ebus_to_hbus(ebus);
 
-        while (!list_empty(&bus->stream_list)) {
-                s = list_first_entry(&bus->stream_list, struct hdac_stream, list);
+        list_for_each_entry_safe(s, _s, &bus->stream_list, list) {
                 stream = stream_to_hdac_ext_stream(s);
                 snd_hdac_ext_stream_decouple(ebus, stream, false);
                 list_del(&s->list);
diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c
index 64e0d1d81ca5..9739fce9e032 100644
--- a/sound/pci/hda/hda_sysfs.c
+++ b/sound/pci/hda/hda_sysfs.c
@@ -141,14 +141,6 @@ static int reconfig_codec(struct hda_codec *codec)
         err = snd_hda_codec_configure(codec);
         if (err < 0)
                 goto error;
-        /* rebuild PCMs */
-        err = snd_hda_codec_build_pcms(codec);
-        if (err < 0)
-                goto error;
-        /* rebuild mixers */
-        err = snd_hda_codec_build_controls(codec);
-        if (err < 0)
-                goto error;
         err = snd_card_register(codec->card);
  error:
         snd_hda_power_down(codec);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a2fdf5f91d43..002f153bc659 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6438,6 +6438,7 @@ enum {
         ALC668_FIXUP_DELL_DISABLE_AAMIX,
         ALC668_FIXUP_DELL_XPS13,
         ALC662_FIXUP_ASUS_Nx50,
+        ALC668_FIXUP_ASUS_Nx51,
 };
 
 static const struct hda_fixup alc662_fixups[] = {
@@ -6684,6 +6685,15 @@ static const struct hda_fixup alc662_fixups[] = {
                 .chained = true,
                 .chain_id = ALC662_FIXUP_BASS_1A
         },
+        [ALC668_FIXUP_ASUS_Nx51] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        {0x1a, 0x90170151}, /* bass speaker */
+                        {}
+                },
+                .chained = true,
+                .chain_id = ALC662_FIXUP_BASS_CHMAP,
+        },
 };
 
 static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -6706,11 +6716,14 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
+        SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),
         SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),
         SND_PCI_QUIRK(0x1043, 0x13df, "Asus N550JX", ALC662_FIXUP_BASS_1A),
         SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50),
         SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
         SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
+        SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),
+        SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),
         SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
         SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
         SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 649e92a252ae..7ef3a0c16478 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -629,6 +629,7 @@ config SND_SOC_RT5514
 
 config SND_SOC_RT5616
         tristate "Realtek RT5616 CODEC"
+        depends on I2C
 
 config SND_SOC_RT5631
         tristate "Realtek ALC5631/RT5631 CODEC"
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 92d22a018d68..83959312f7a0 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -249,6 +249,18 @@ int arizona_init_spk(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(arizona_init_spk);
 
+int arizona_free_spk(struct snd_soc_codec *codec)
+{
+        struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->arizona;
+
+        arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN, arizona);
+        arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT, arizona);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(arizona_free_spk);
+
 static const struct snd_soc_dapm_route arizona_mono_routes[] = {
         { "OUT1R", NULL, "OUT1L" },
         { "OUT2R", NULL, "OUT2L" },
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 1ea8e4ecf8d4..ce0531b8c632 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -307,6 +307,8 @@ extern int arizona_init_spk(struct snd_soc_codec *codec);
 extern int arizona_init_gpio(struct snd_soc_codec *codec);
 extern int arizona_init_mono(struct snd_soc_codec *codec);
 
+extern int arizona_free_spk(struct snd_soc_codec *codec);
+
 extern int arizona_init_dai(struct arizona_priv *priv, int dai);
 
 int arizona_set_output_mode(struct snd_soc_codec *codec, int output,
diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 44c30fe3e315..287d13740be4 100644
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -274,7 +274,9 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
         if (of_property_read_u32(np, "cirrus,sdout-share", &val) >= 0)
                 pdata->sdout_share = val;
 
-        of_property_read_u32(np, "cirrus,boost-manager", &val);
+        if (of_property_read_u32(np, "cirrus,boost-manager", &val))
+                val = -1u;
+
         switch (val) {
         case CS35L32_BOOST_MGR_AUTO:
         case CS35L32_BOOST_MGR_AUTO_AUDIO:
@@ -282,13 +284,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
         case CS35L32_BOOST_MGR_FIXED:
                 pdata->boost_mng = val;
                 break;
+        case -1u:
         default:
                 dev_err(&i2c_client->dev,
                         "Wrong cirrus,boost-manager DT value %d\n", val);
                 pdata->boost_mng = CS35L32_BOOST_MGR_BYPASS;
         }
 
-        of_property_read_u32(np, "cirrus,sdout-datacfg", &val);
+        if (of_property_read_u32(np, "cirrus,sdout-datacfg", &val))
+                val = -1u;
         switch (val) {
         case CS35L32_DATA_CFG_LR_VP:
         case CS35L32_DATA_CFG_LR_STAT:
@@ -296,13 +300,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
         case CS35L32_DATA_CFG_LR_VPSTAT:
                 pdata->sdout_datacfg = val;
                 break;
+        case -1u:
         default:
                 dev_err(&i2c_client->dev,
                         "Wrong cirrus,sdout-datacfg DT value %d\n", val);
                 pdata->sdout_datacfg = CS35L32_DATA_CFG_LR;
         }
 
-        of_property_read_u32(np, "cirrus,battery-threshold", &val);
+        if (of_property_read_u32(np, "cirrus,battery-threshold", &val))
+                val = -1u;
         switch (val) {
         case CS35L32_BATT_THRESH_3_1V:
         case CS35L32_BATT_THRESH_3_2V:
@@ -310,13 +316,15 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
         case CS35L32_BATT_THRESH_3_4V:
                 pdata->batt_thresh = val;
                 break;
+        case -1u:
         default:
                 dev_err(&i2c_client->dev,
                         "Wrong cirrus,battery-threshold DT value %d\n", val);
                 pdata->batt_thresh = CS35L32_BATT_THRESH_3_3V;
         }
 
-        of_property_read_u32(np, "cirrus,battery-recovery", &val);
+        if (of_property_read_u32(np, "cirrus,battery-recovery", &val))
+                val = -1u;
         switch (val) {
         case CS35L32_BATT_RECOV_3_1V:
         case CS35L32_BATT_RECOV_3_2V:
@@ -326,6 +334,7 @@ static int cs35l32_handle_of_data(struct i2c_client *i2c_client,
         case CS35L32_BATT_RECOV_3_6V:
                 pdata->batt_recov = val;
                 break;
+        case -1u:
         default:
                 dev_err(&i2c_client->dev,
                         "Wrong cirrus,battery-recovery DT value %d\n", val);
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 576087bda330..00e9b6fc1b5c 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1108,6 +1108,9 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec)
         priv->core.arizona->dapm = NULL;
 
         arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
+
+        arizona_free_spk(codec);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 26f9459cb3bc..aaa038ffc8a5 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -1420,32 +1420,39 @@ static int hdmi_codec_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int hdmi_codec_resume(struct snd_soc_codec *codec)
+static int hdmi_codec_prepare(struct device *dev)
 {
-        struct hdac_ext_device *edev = snd_soc_codec_get_drvdata(codec);
+        struct hdac_ext_device *edev = to_hda_ext_device(dev);
+        struct hdac_device *hdac = &edev->hdac;
+
+        pm_runtime_get_sync(&edev->hdac.dev);
+
+        /*
+         * Power down afg.
+         * codec_read is preferred over codec_write to set the power state.
+         * This way verb is send to set the power state and response
+         * is received. So setting power state is ensured without using loop
+         * to read the state.
+         */
+        snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE,
+                                                        AC_PWRST_D3);
+
+        return 0;
+}
+
+static void hdmi_codec_complete(struct device *dev)
+{
+        struct hdac_ext_device *edev = to_hda_ext_device(dev);
         struct hdac_hdmi_priv *hdmi = edev->private_data;
         struct hdac_hdmi_pin *pin;
         struct hdac_device *hdac = &edev->hdac;
-        struct hdac_bus *bus = hdac->bus;
-        int err;
-        unsigned long timeout;
-
-        hdac_hdmi_skl_enable_all_pins(&edev->hdac);
-        hdac_hdmi_skl_enable_dp12(&edev->hdac);
 
         /* Power up afg */
-        if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D0)) {
-
-                snd_hdac_codec_write(hdac, hdac->afg, 0,
-                        AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE,
+                                                        AC_PWRST_D0);
 
-                /* Wait till power state is set to D0 */
-                timeout = jiffies + msecs_to_jiffies(1000);
-                while (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D0)
-                                && time_before(jiffies, timeout)) {
-                        msleep(50);
-                }
-        }
+        hdac_hdmi_skl_enable_all_pins(&edev->hdac);
+        hdac_hdmi_skl_enable_dp12(&edev->hdac);
 
         /*
          * As the ELD notify callback request is not entertained while the
@@ -1455,28 +1462,16 @@ static int hdmi_codec_resume(struct snd_soc_codec *codec)
         list_for_each_entry(pin, &hdmi->pin_list, head)
                 hdac_hdmi_present_sense(pin, 1);
 
-        /*
-         * Codec power is turned ON during controller resume.
-         * Turn it OFF here
-         */
-        err = snd_hdac_display_power(bus, false);
-        if (err < 0) {
-                dev_err(bus->dev,
-                        "Cannot turn OFF display power on i915, err: %d\n",
-                        err);
-                return err;
-        }
-
-        return 0;
+        pm_runtime_put_sync(&edev->hdac.dev);
 }
 #else
-#define hdmi_codec_resume NULL
+#define hdmi_codec_prepare NULL
+#define hdmi_codec_complete NULL
 #endif
 
 static struct snd_soc_codec_driver hdmi_hda_codec = {
         .probe          = hdmi_codec_probe,
         .remove         = hdmi_codec_remove,
-        .resume         = hdmi_codec_resume,
         .idle_bias_off  = true,
 };
 
@@ -1561,7 +1556,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
         struct hdac_ext_device *edev = to_hda_ext_device(dev);
         struct hdac_device *hdac = &edev->hdac;
         struct hdac_bus *bus = hdac->bus;
-        unsigned long timeout;
         int err;
 
         dev_dbg(dev, "Enter: %s\n", __func__);
@@ -1570,20 +1564,15 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
         if (!bus)
                 return 0;
 
-        /* Power down afg */
-        if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)) {
-                snd_hdac_codec_write(hdac, hdac->afg, 0,
-                        AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-
-                /* Wait till power state is set to D3 */
-                timeout = jiffies + msecs_to_jiffies(1000);
-                while (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D3)
-                                && time_before(jiffies, timeout)) {
-
-                        msleep(50);
-                }
-        }
-
+        /*
+         * Power down afg.
+         * codec_read is preferred over codec_write to set the power state.
+         * This way verb is send to set the power state and response
+         * is received. So setting power state is ensured without using loop
+         * to read the state.
+         */
+        snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE,
+                                                        AC_PWRST_D3);
         err = snd_hdac_display_power(bus, false);
         if (err < 0) {
                 dev_err(bus->dev, "Cannot turn on display power on i915\n");
@@ -1616,9 +1605,8 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
         hdac_hdmi_skl_enable_dp12(&edev->hdac);
 
         /* Power up afg */
-        if (!snd_hdac_check_power_state(hdac, hdac->afg, AC_PWRST_D0))
-                snd_hdac_codec_write(hdac, hdac->afg, 0,
-                        AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE,
+                                                        AC_PWRST_D0);
 
         return 0;
 }
@@ -1629,6 +1617,8 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
 
 static const struct dev_pm_ops hdac_hdmi_pm = {
         SET_RUNTIME_PM_OPS(hdac_hdmi_runtime_suspend, hdac_hdmi_runtime_resume, NULL)
+        .prepare = hdmi_codec_prepare,
+        .complete = hdmi_codec_complete,
 };
 
 static const struct hda_device_id hdmi_list[] = {
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index 1c8729984c2b..683769f0f246 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -343,9 +343,12 @@ static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = {
         SND_SOC_DAPM_SUPPLY("ADC Power", NAU8825_REG_ANALOG_ADC_2, 6, 0, NULL,
                 0),
 
-        /* ADC for button press detection */
-        SND_SOC_DAPM_ADC("SAR", NULL, NAU8825_REG_SAR_CTRL,
-                NAU8825_SAR_ADC_EN_SFT, 0),
+        /* ADC for button press detection. A dapm supply widget is used to
+         * prevent dapm_power_widgets keeping the codec at SND_SOC_BIAS_ON
+         * during suspend.
+         */
+        SND_SOC_DAPM_SUPPLY("SAR", NAU8825_REG_SAR_CTRL,
+                NAU8825_SAR_ADC_EN_SFT, 0, NULL, 0),
 
         SND_SOC_DAPM_PGA_S("ADACL", 2, NAU8825_REG_RDAC, 12, 0, NULL, 0),
         SND_SOC_DAPM_PGA_S("ADACR", 2, NAU8825_REG_RDAC, 13, 0, NULL, 0),
@@ -607,6 +610,16 @@ static bool nau8825_is_jack_inserted(struct regmap *regmap)
 
 static void nau8825_restart_jack_detection(struct regmap *regmap)
 {
+        /* Chip needs one FSCLK cycle in order to generate interrupts,
+         * as we cannot guarantee one will be provided by the system. Turning
+         * master mode on then off enables us to generate that FSCLK cycle
+         * with a minimum of contention on the clock bus.
+         */
+        regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2,
+                NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER);
+        regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2,
+                NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE);
+
         /* this will restart the entire jack detection process including MIC/GND
          * switching and create interrupts. We have to go from 0 to 1 and back
          * to 0 to restart.
@@ -728,7 +741,10 @@ static irqreturn_t nau8825_interrupt(int irq, void *data)
         struct regmap *regmap = nau8825->regmap;
         int active_irq, clear_irq = 0, event = 0, event_mask = 0;
 
-        regmap_read(regmap, NAU8825_REG_IRQ_STATUS, &active_irq);
+        if (regmap_read(regmap, NAU8825_REG_IRQ_STATUS, &active_irq)) {
+                dev_err(nau8825->dev, "failed to read irq status\n");
+                return IRQ_NONE;
+        }
 
         if ((active_irq & NAU8825_JACK_EJECTION_IRQ_MASK) ==
                 NAU8825_JACK_EJECTION_DETECTED) {
@@ -1141,33 +1157,74 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec,
                                         return ret;
                                 }
                         }
-
-                        ret = regcache_sync(nau8825->regmap);
-                        if (ret) {
-                                dev_err(codec->dev,
-                                        "Failed to sync cache: %d\n", ret);
-                                return ret;
-                        }
                 }
-
                 break;
 
         case SND_SOC_BIAS_OFF:
                 if (nau8825->mclk_freq)
                         clk_disable_unprepare(nau8825->mclk);
-
-                regcache_mark_dirty(nau8825->regmap);
                 break;
         }
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int nau8825_suspend(struct snd_soc_codec *codec)
+{
+        struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
+
+        disable_irq(nau8825->irq);
+        regcache_cache_only(nau8825->regmap, true);
+        regcache_mark_dirty(nau8825->regmap);
+
+        return 0;
+}
+
+static int nau8825_resume(struct snd_soc_codec *codec)
+{
+        struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
+
+        /* The chip may lose power and reset in S3. regcache_sync restores
+         * register values including configurations for sysclk, irq, and
+         * jack/button detection.
+         */
+        regcache_cache_only(nau8825->regmap, false);
+        regcache_sync(nau8825->regmap);
+
+        /* Check the jack plug status directly. If the headset is unplugged
+         * during S3 when the chip has no power, there will be no jack
+         * detection irq even after the nau8825_restart_jack_detection below,
+         * because the chip just thinks no headset has ever been plugged in.
+         */
+        if (!nau8825_is_jack_inserted(nau8825->regmap)) {
+                nau8825_eject_jack(nau8825);
+                snd_soc_jack_report(nau8825->jack, 0, SND_JACK_HEADSET);
+        }
+
+        enable_irq(nau8825->irq);
+
+        /* Run jack detection to check the type (OMTP or CTIA) of the headset
+         * if there is one. This handles the case where a different type of
+         * headset is plugged in during S3. This triggers an IRQ iff a headset
+         * is already plugged in.
+         */
+        nau8825_restart_jack_detection(nau8825->regmap);
+
+        return 0;
+}
+#else
+#define nau8825_suspend NULL
+#define nau8825_resume NULL
+#endif
+
 static struct snd_soc_codec_driver nau8825_codec_driver = {
         .probe = nau8825_codec_probe,
         .set_sysclk = nau8825_set_sysclk,
         .set_pll = nau8825_set_pll,
         .set_bias_level = nau8825_set_bias_level,
         .suspend_bias_off = true,
+        .suspend = nau8825_suspend,
+        .resume = nau8825_resume,
 
         .controls = nau8825_controls,
         .num_controls = ARRAY_SIZE(nau8825_controls),
@@ -1277,16 +1334,6 @@ static int nau8825_setup_irq(struct nau8825 *nau8825)
         regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL,
                 NAU8825_ENABLE_DACR, NAU8825_ENABLE_DACR);
 
-        /* Chip needs one FSCLK cycle in order to generate interrupts,
-         * as we cannot guarantee one will be provided by the system. Turning
-         * master mode on then off enables us to generate that FSCLK cycle
-         * with a minimum of contention on the clock bus.
-         */
-        regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2,
-                NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER);
-        regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2,
-                NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE);
-
         ret = devm_request_threaded_irq(nau8825->dev, nau8825->irq, NULL,
                 nau8825_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
                 "nau8825", nau8825);
@@ -1354,36 +1401,6 @@ static int nau8825_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int nau8825_suspend(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        struct nau8825 *nau8825 = dev_get_drvdata(dev);
-
-        disable_irq(client->irq);
-        regcache_cache_only(nau8825->regmap, true);
-        regcache_mark_dirty(nau8825->regmap);
-
-        return 0;
-}
-
-static int nau8825_resume(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        struct nau8825 *nau8825 = dev_get_drvdata(dev);
-
-        regcache_cache_only(nau8825->regmap, false);
-        regcache_sync(nau8825->regmap);
-        enable_irq(client->irq);
-
-        return 0;
-}
-#endif
-
-static const struct dev_pm_ops nau8825_pm = {
-        SET_SYSTEM_SLEEP_PM_OPS(nau8825_suspend, nau8825_resume)
-};
-
 static const struct i2c_device_id nau8825_i2c_ids[] = {
         { "nau8825", 0 },
         { }
@@ -1410,7 +1427,6 @@ static struct i2c_driver nau8825_driver = {
                 .name = "nau8825",
                 .of_match_table = of_match_ptr(nau8825_of_ids),
                 .acpi_match_table = ACPI_PTR(nau8825_acpi_match),
-                .pm = &nau8825_pm,
         },
         .probe = nau8825_i2c_probe,
         .remove = nau8825_i2c_remove,
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index e8b5ba04417a..09e8988bbb2d 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -359,7 +359,7 @@ static const DECLARE_TLV_DB_RANGE(bst_tlv,
 
 /* Interface data select */
 static const char * const rt5640_data_select[] = {
-        "Normal", "left copy to right", "right copy to left", "Swap"};
+        "Normal", "Swap", "left copy to right", "right copy to left"};
 
 static SOC_ENUM_SINGLE_DECL(rt5640_if1_dac_enum, RT5640_DIG_INF_DATA,
                             RT5640_IF1_DAC_SEL_SFT, rt5640_data_select);
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 1761c3a98b76..58b664b06c16 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -443,39 +443,39 @@
 #define RT5640_IF1_DAC_SEL_MASK                 (0x3 << 14)
 #define RT5640_IF1_DAC_SEL_SFT                  14
 #define RT5640_IF1_DAC_SEL_NOR                  (0x0 << 14)
-#define RT5640_IF1_DAC_SEL_L2R                  (0x1 << 14)
-#define RT5640_IF1_DAC_SEL_R2L                  (0x2 << 14)
-#define RT5640_IF1_DAC_SEL_SWAP                 (0x3 << 14)
+#define RT5640_IF1_DAC_SEL_SWAP                 (0x1 << 14)
+#define RT5640_IF1_DAC_SEL_L2R                  (0x2 << 14)
+#define RT5640_IF1_DAC_SEL_R2L                  (0x3 << 14)
 #define RT5640_IF1_ADC_SEL_MASK                 (0x3 << 12)
 #define RT5640_IF1_ADC_SEL_SFT                  12
 #define RT5640_IF1_ADC_SEL_NOR                  (0x0 << 12)
-#define RT5640_IF1_ADC_SEL_L2R                  (0x1 << 12)
-#define RT5640_IF1_ADC_SEL_R2L                  (0x2 << 12)
-#define RT5640_IF1_ADC_SEL_SWAP                 (0x3 << 12)
+#define RT5640_IF1_ADC_SEL_SWAP                 (0x1 << 12)
+#define RT5640_IF1_ADC_SEL_L2R                  (0x2 << 12)
+#define RT5640_IF1_ADC_SEL_R2L                  (0x3 << 12)
 #define RT5640_IF2_DAC_SEL_MASK                 (0x3 << 10)
 #define RT5640_IF2_DAC_SEL_SFT                  10
 #define RT5640_IF2_DAC_SEL_NOR                  (0x0 << 10)
-#define RT5640_IF2_DAC_SEL_L2R                  (0x1 << 10)
-#define RT5640_IF2_DAC_SEL_R2L                  (0x2 << 10)
-#define RT5640_IF2_DAC_SEL_SWAP                 (0x3 << 10)
+#define RT5640_IF2_DAC_SEL_SWAP                 (0x1 << 10)
+#define RT5640_IF2_DAC_SEL_L2R                  (0x2 << 10)
+#define RT5640_IF2_DAC_SEL_R2L                  (0x3 << 10)
 #define RT5640_IF2_ADC_SEL_MASK                 (0x3 << 8)
 #define RT5640_IF2_ADC_SEL_SFT                  8
 #define RT5640_IF2_ADC_SEL_NOR                  (0x0 << 8)
-#define RT5640_IF2_ADC_SEL_L2R                  (0x1 << 8)
-#define RT5640_IF2_ADC_SEL_R2L                  (0x2 << 8)
-#define RT5640_IF2_ADC_SEL_SWAP                 (0x3 << 8)
+#define RT5640_IF2_ADC_SEL_SWAP                 (0x1 << 8)
+#define RT5640_IF2_ADC_SEL_L2R                  (0x2 << 8)
+#define RT5640_IF2_ADC_SEL_R2L                  (0x3 << 8)
 #define RT5640_IF3_DAC_SEL_MASK                 (0x3 << 6)
 #define RT5640_IF3_DAC_SEL_SFT                  6
 #define RT5640_IF3_DAC_SEL_NOR                  (0x0 << 6)
-#define RT5640_IF3_DAC_SEL_L2R                  (0x1 << 6)
-#define RT5640_IF3_DAC_SEL_R2L                  (0x2 << 6)
-#define RT5640_IF3_DAC_SEL_SWAP                 (0x3 << 6)
+#define RT5640_IF3_DAC_SEL_SWAP                 (0x1 << 6)
+#define RT5640_IF3_DAC_SEL_L2R                  (0x2 << 6)
+#define RT5640_IF3_DAC_SEL_R2L                  (0x3 << 6)
 #define RT5640_IF3_ADC_SEL_MASK                 (0x3 << 4)
 #define RT5640_IF3_ADC_SEL_SFT                  4
 #define RT5640_IF3_ADC_SEL_NOR                  (0x0 << 4)
-#define RT5640_IF3_ADC_SEL_L2R                  (0x1 << 4)
-#define RT5640_IF3_ADC_SEL_R2L                  (0x2 << 4)
-#define RT5640_IF3_ADC_SEL_SWAP                 (0x3 << 4)
+#define RT5640_IF3_ADC_SEL_SWAP                 (0x1 << 4)
+#define RT5640_IF3_ADC_SEL_L2R                  (0x2 << 4)
+#define RT5640_IF3_ADC_SEL_R2L                  (0x3 << 4)
 
 /* REC Left Mixer Control 1 (0x3b) */
 #define RT5640_G_HP_L_RM_L_MASK                 (0x7 << 13)
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index a8b3e3f701f9..1bae17ee8817 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1955,11 +1955,16 @@ err_adsp2_codec_probe:
 static int wm5102_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
+        struct arizona *arizona = priv->core.arizona;
 
         wm_adsp2_codec_remove(&priv->core.adsp[0], codec);
 
         priv->core.arizona->dapm = NULL;
 
+        arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
+
+        arizona_free_spk(codec);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 83ba70fe16e6..2728ac545ffe 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2298,6 +2298,8 @@ static int wm5110_codec_remove(struct snd_soc_codec *codec)
 
         arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
 
+        arizona_free_spk(codec);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 88223608a33f..720a14e0687d 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2471,7 +2471,7 @@ static void wm8962_configure_bclk(struct snd_soc_codec *codec)
                 break;
         default:
                 dev_warn(codec->dev, "Unknown DSPCLK divisor read back\n");
-                dspclk = wm8962->sysclk;
+                dspclk = wm8962->sysclk_rate;
         }
 
         dev_dbg(codec->dev, "DSPCLK is %dHz, BCLK %d\n", dspclk, wm8962->bclk);
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 52d766efe14f..6b0785b5a5c5 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1072,6 +1072,8 @@ static int wm8997_codec_remove(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = NULL;
 
+        arizona_free_spk(codec);
+
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 012396074a8a..449f66636205 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -1324,6 +1324,8 @@ static int wm8998_codec_remove(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = NULL;
 
+        arizona_free_spk(codec);
+
         return 0;
 }
 
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index b3e6c2300457..1120f4f4d011 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -163,7 +163,6 @@ config SND_SOC_INTEL_SKYLAKE
         tristate
         select SND_HDA_EXT_CORE
         select SND_SOC_TOPOLOGY
-        select SND_HDA_I915
         select SND_SOC_INTEL_SST
 
 config SND_SOC_INTEL_SKL_RT286_MACH
diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c
index ac60f1301e21..91565229d074 100644
--- a/sound/soc/intel/haswell/sst-haswell-ipc.c
+++ b/sound/soc/intel/haswell/sst-haswell-ipc.c
@@ -1345,7 +1345,7 @@ int sst_hsw_stream_reset(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
                 return 0;
 
         /* wait for pause to complete before we reset the stream */
-        while (stream->running && tries--)
+        while (stream->running && --tries)
                 msleep(1);
         if (!tries) {
                 dev_err(hsw->dev, "error: reset stream %d still running\n",
diff --git a/sound/soc/intel/skylake/skl-sst-dsp.c b/sound/soc/intel/skylake/skl-sst-dsp.c
index a5267e8a96e0..2962ef22fc84 100644
--- a/sound/soc/intel/skylake/skl-sst-dsp.c
+++ b/sound/soc/intel/skylake/skl-sst-dsp.c
@@ -336,6 +336,11 @@ void skl_dsp_free(struct sst_dsp *dsp)
         skl_ipc_int_disable(dsp);
 
         free_irq(dsp->irq, dsp);
+        dsp->cl_dev.ops.cl_cleanup_controller(dsp);
+        skl_cldma_int_disable(dsp);
+        skl_ipc_op_int_disable(dsp);
+        skl_ipc_int_disable(dsp);
+
         skl_dsp_disable_core(dsp);
 }
 EXPORT_SYMBOL_GPL(skl_dsp_free);
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 545b4e77b8aa..cdb78b7e5a14 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -239,6 +239,7 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
 {
         int multiplier = 1;
         struct skl_module_fmt *in_fmt, *out_fmt;
+        int in_rate, out_rate;
 
 
         /* Since fixups is applied to pin 0 only, ibs, obs needs
@@ -249,15 +250,24 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
 
         if (mcfg->m_type == SKL_MODULE_TYPE_SRCINT)
                 multiplier = 5;
-        mcfg->ibs = (in_fmt->s_freq / 1000) *
-                                (mcfg->in_fmt->channels) *
-                                (mcfg->in_fmt->bit_depth >> 3) *
-                                multiplier;
-
-        mcfg->obs = (mcfg->out_fmt->s_freq / 1000) *
-                                (mcfg->out_fmt->channels) *
-                                (mcfg->out_fmt->bit_depth >> 3) *
-                                multiplier;
+
+        if (in_fmt->s_freq % 1000)
+                in_rate = (in_fmt->s_freq / 1000) + 1;
+        else
+                in_rate = (in_fmt->s_freq / 1000);
+
+        mcfg->ibs = in_rate * (mcfg->in_fmt->channels) *
+                        (mcfg->in_fmt->bit_depth >> 3) *
+                        multiplier;
+
+        if (mcfg->out_fmt->s_freq % 1000)
+                out_rate = (mcfg->out_fmt->s_freq / 1000) + 1;
+        else
+                out_rate = (mcfg->out_fmt->s_freq / 1000);
+
+        mcfg->obs = out_rate * (mcfg->out_fmt->channels) *
+                        (mcfg->out_fmt->bit_depth >> 3) *
+                        multiplier;
 }
 
 static int skl_tplg_update_be_blob(struct snd_soc_dapm_widget *w,
@@ -485,11 +495,15 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
                 if (!skl_is_pipe_mcps_avail(skl, mconfig))
                         return -ENOMEM;
 
+                skl_tplg_alloc_pipe_mcps(skl, mconfig);
+
                 if (mconfig->is_loadable && ctx->dsp->fw_ops.load_mod) {
                         ret = ctx->dsp->fw_ops.load_mod(ctx->dsp,
                                 mconfig->id.module_id, mconfig->guid);
                         if (ret < 0)
                                 return ret;
+
+                        mconfig->m_state = SKL_MODULE_LOADED;
                 }
 
                 /* update blob if blob is null for be with default value */
@@ -509,7 +523,6 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
                 ret = skl_tplg_set_module_params(w, ctx);
                 if (ret < 0)
                         return ret;
-                skl_tplg_alloc_pipe_mcps(skl, mconfig);
         }
 
         return 0;
@@ -524,7 +537,8 @@ static int skl_tplg_unload_pipe_modules(struct skl_sst *ctx,
         list_for_each_entry(w_module, &pipe->w_list, node) {
                 mconfig  = w_module->w->priv;
 
-                if (mconfig->is_loadable && ctx->dsp->fw_ops.unload_mod)
+                if (mconfig->is_loadable && ctx->dsp->fw_ops.unload_mod &&
+                        mconfig->m_state > SKL_MODULE_UNINIT)
                         return ctx->dsp->fw_ops.unload_mod(ctx->dsp,
                                                 mconfig->id.module_id);
         }
@@ -558,6 +572,9 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
         if (!skl_is_pipe_mem_avail(skl, mconfig))
                 return -ENOMEM;
 
+        skl_tplg_alloc_pipe_mem(skl, mconfig);
+        skl_tplg_alloc_pipe_mcps(skl, mconfig);
+
         /*
          * Create a list of modules for pipe.
          * This list contains modules from source to sink
@@ -601,9 +618,6 @@ static int skl_tplg_mixer_dapm_pre_pmu_event(struct snd_soc_dapm_widget *w,
                 src_module = dst_module;
         }
 
-        skl_tplg_alloc_pipe_mem(skl, mconfig);
-        skl_tplg_alloc_pipe_mcps(skl, mconfig);
-
         return 0;
 }
 
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index de3c401284d9..d2d923002d5c 100644
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -274,10 +274,10 @@ struct skl_pipe {
 
 enum skl_module_state {
         SKL_MODULE_UNINIT = 0,
-        SKL_MODULE_INIT_DONE = 1,
-        SKL_MODULE_LOADED = 2,
-        SKL_MODULE_UNLOADED = 3,
-        SKL_MODULE_BIND_DONE = 4
+        SKL_MODULE_LOADED = 1,
+        SKL_MODULE_INIT_DONE = 2,
+        SKL_MODULE_BIND_DONE = 3,
+        SKL_MODULE_UNLOADED = 4,
 };
 
 struct skl_module_cfg {
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index ab5e25aaeee3..3982f5536f2d 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -222,6 +222,7 @@ static int skl_suspend(struct device *dev)
         struct hdac_ext_bus *ebus = pci_get_drvdata(pci);
         struct skl *skl  = ebus_to_skl(ebus);
         struct hdac_bus *bus = ebus_to_hbus(ebus);
+        int ret = 0;
 
         /*
          * Do not suspend if streams which are marked ignore suspend are
@@ -232,10 +233,20 @@ static int skl_suspend(struct device *dev)
                 enable_irq_wake(bus->irq);
                 pci_save_state(pci);
                 pci_disable_device(pci);
-                return 0;
         } else {
-                return _skl_suspend(ebus);
+                ret = _skl_suspend(ebus);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
+                ret = snd_hdac_display_power(bus, false);
+                if (ret < 0)
+                        dev_err(bus->dev,
+                                "Cannot turn OFF display power on i915\n");
         }
+
+        return ret;
 }
 
 static int skl_resume(struct device *dev)
@@ -316,17 +327,20 @@ static int skl_free(struct hdac_ext_bus *ebus)
 
         if (bus->irq >= 0)
                 free_irq(bus->irq, (void *)bus);
-        if (bus->remap_addr)
-                iounmap(bus->remap_addr);
-
         snd_hdac_bus_free_stream_pages(bus);
         snd_hdac_stream_free_all(ebus);
         snd_hdac_link_free_all(ebus);
+
+        if (bus->remap_addr)
+                iounmap(bus->remap_addr);
+
         pci_release_regions(skl->pci);
         pci_disable_device(skl->pci);
 
         snd_hdac_ext_bus_exit(ebus);
 
+        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
+                snd_hdac_i915_exit(&ebus->bus);
         return 0;
 }
 
@@ -719,12 +733,12 @@ static void skl_remove(struct pci_dev *pci)
         if (skl->tplg)
                 release_firmware(skl->tplg);
 
-        if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
-                snd_hdac_i915_exit(&ebus->bus);
-
         if (pci_dev_run_wake(pci))
                 pm_runtime_get_noresume(&pci->dev);
-        pci_dev_put(pci);
+
+        /* codec removal, invoke bus_device_remove */
+        snd_hdac_ext_bus_device_remove(ebus);
+
         skl_platform_unregister(&pci->dev);
         skl_free_dsp(skl);
         skl_machine_device_unregister(skl);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 801ae1a81dfd..c4464858bf01 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2188,6 +2188,13 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt,
         int count = 0;
         char *state = "not set";
 
+        /* card won't be set for the dummy component, as a spot fix
+         * we're checking for that case specifically here but in future
+         * we will ensure that the dummy component looks like others.
+         */
+        if (!cmpnt->card)
+                return 0;
+
         list_for_each_entry(w, &cmpnt->card->widgets, list) {
                 if (w->dapm != dapm)
                         continue;
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index d14bf411515b..a452ad7cec40 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -15,7 +15,6 @@ config SND_USB_AUDIO
         select SND_RAWMIDI
         select SND_PCM
         select BITREVERSE
-        select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO)
         help
           Say Y here to include support for USB audio and USB MIDI
           devices.
@@ -23,9 +22,6 @@ config SND_USB_AUDIO
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-audio.
 
-config SND_USB_AUDIO_USE_MEDIA_CONTROLLER
-        bool
-
 config SND_USB_UA101
         tristate "Edirol UA-101/UA-1000 driver"
         select SND_PCM
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 8dca3c407f5a..2d2d122b069f 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -15,8 +15,6 @@ snd-usb-audio-objs := 	card.o \
                         quirks.o \
                         stream.o
 
-snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
-
 snd-usbmidi-lib-objs := midi.o
 
 # Toplevel Module Dependency
diff --git a/sound/usb/card.c b/sound/usb/card.c
index c4665dc606ca..69860da473ea 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -66,7 +66,6 @@
 #include "format.h"
 #include "power.h"
 #include "stream.h"
-#include "media.h"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -616,11 +615,6 @@ static int usb_audio_probe(struct usb_interface *intf,
         if (err < 0)
                 goto __error;
 
-        if (quirk->media_device) {
-                /* don't want to fail when media_snd_device_create() fails */
-                media_snd_device_create(chip, intf);
-        }
-
         usb_chip[chip->index] = chip;
         chip->num_interfaces++;
         usb_set_intfdata(intf, chip);
@@ -677,14 +671,6 @@ static void usb_audio_disconnect(struct usb_interface *intf)
                 list_for_each(p, &chip->midi_list) {
                         snd_usbmidi_disconnect(p);
                 }
-                /*
-                 * Nice to check quirk && quirk->media_device
-                 * need some special handlings. Doesn't look like
-                 * we have access to quirk here
-                 * Acceses mixer_list
-                */
-                media_snd_device_delete(chip);
-
                 /* release mixer resources */
                 list_for_each_entry(mixer, &chip->mixer_list, list) {
                         snd_usb_mixer_disconnect(mixer);
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 34a0898e2238..71778ca4b26a 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -105,8 +105,6 @@ struct snd_usb_endpoint {
         struct list_head list;
 };
 
-struct media_ctl;
-
 struct snd_usb_substream {
         struct snd_usb_stream *stream;
         struct usb_device *dev;
@@ -158,7 +156,6 @@ struct snd_usb_substream {
         } dsd_dop;
 
         bool trigger_tstamp_pending_update; /* trigger timestamp being updated from initial estimate */
-        struct media_ctl *media_ctl;
 };
 
 struct snd_usb_stream {
diff --git a/sound/usb/media.c b/sound/usb/media.c
deleted file mode 100644
index 93a50d01490c..000000000000
--- a/sound/usb/media.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * media.c - Media Controller specific ALSA driver code
- *
- * Copyright (c) 2016 Shuah Khan <shuahkh@osg.samsung.com>
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * This file is released under the GPLv2.
- */
-
-/*
- * This file adds Media Controller support to ALSA driver
- * to use the Media Controller API to share tuner with DVB
- * and V4L2 drivers that control media device. Media device
- * is created based on existing quirks framework. Using this
- * approach, the media controller API usage can be added for
- * a specific device.
-*/
-
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/slab.h>
-#include <linux/usb.h>
-
-#include <sound/pcm.h>
-#include <sound/core.h>
-
-#include "usbaudio.h"
-#include "card.h"
-#include "mixer.h"
-#include "media.h"
-
-static int media_snd_enable_source(struct media_ctl *mctl)
-{
-        if (mctl && mctl->media_dev->enable_source)
-                return mctl->media_dev->enable_source(&mctl->media_entity,
-                                                      &mctl->media_pipe);
-        return 0;
-}
-
-static void media_snd_disable_source(struct media_ctl *mctl)
-{
-        if (mctl && mctl->media_dev->disable_source)
-                mctl->media_dev->disable_source(&mctl->media_entity);
-}
-
-int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
-                        int stream)
-{
-        struct media_device *mdev;
-        struct media_ctl *mctl;
-        struct device *pcm_dev = &pcm->streams[stream].dev;
-        u32 intf_type;
-        int ret = 0;
-        u16 mixer_pad;
-        struct media_entity *entity;
-
-        mdev = subs->stream->chip->media_dev;
-        if (!mdev)
-                return -ENODEV;
-
-        if (subs->media_ctl)
-                return 0;
-
-        /* allocate media_ctl */
-        mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
-        if (!mctl)
-                return -ENOMEM;
-
-        mctl->media_dev = mdev;
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                intf_type = MEDIA_INTF_T_ALSA_PCM_PLAYBACK;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_PLAYBACK;
-                mctl->media_pad.flags = MEDIA_PAD_FL_SOURCE;
-                mixer_pad = 1;
-        } else {
-                intf_type = MEDIA_INTF_T_ALSA_PCM_CAPTURE;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_CAPTURE;
-                mctl->media_pad.flags = MEDIA_PAD_FL_SINK;
-                mixer_pad = 2;
-        }
-        mctl->media_entity.name = pcm->name;
-        media_entity_pads_init(&mctl->media_entity, 1, &mctl->media_pad);
-        ret =  media_device_register_entity(mctl->media_dev,
-                                            &mctl->media_entity);
-        if (ret)
-                goto free_mctl;
-
-        mctl->intf_devnode = media_devnode_create(mdev, intf_type, 0,
-                                                  MAJOR(pcm_dev->devt),
-                                                  MINOR(pcm_dev->devt));
-        if (!mctl->intf_devnode) {
-                ret = -ENOMEM;
-                goto unregister_entity;
-        }
-        mctl->intf_link = media_create_intf_link(&mctl->media_entity,
-                                                 &mctl->intf_devnode->intf,
-                                                 MEDIA_LNK_FL_ENABLED);
-        if (!mctl->intf_link) {
-                ret = -ENOMEM;
-                goto devnode_remove;
-        }
-
-        /* create link between mixer and audio */
-        media_device_for_each_entity(entity, mdev) {
-                switch (entity->function) {
-                case MEDIA_ENT_F_AUDIO_MIXER:
-                        ret = media_create_pad_link(entity, mixer_pad,
-                                                    &mctl->media_entity, 0,
-                                                    MEDIA_LNK_FL_ENABLED);
-                        if (ret)
-                                goto remove_intf_link;
-                        break;
-                }
-        }
-
-        subs->media_ctl = mctl;
-        return 0;
-
-remove_intf_link:
-        media_remove_intf_link(mctl->intf_link);
-devnode_remove:
-        media_devnode_remove(mctl->intf_devnode);
-unregister_entity:
-        media_device_unregister_entity(&mctl->media_entity);
-free_mctl:
-        kfree(mctl);
-        return ret;
-}
-
-void media_snd_stream_delete(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl && mctl->media_dev) {
-                struct media_device *mdev;
-
-                mdev = subs->stream->chip->media_dev;
-                if (mdev && media_devnode_is_registered(&mdev->devnode)) {
-                        media_devnode_remove(mctl->intf_devnode);
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                }
-                kfree(mctl);
-                subs->media_ctl = NULL;
-        }
-}
-
-int media_snd_start_pipeline(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl)
-                return media_snd_enable_source(mctl);
-        return 0;
-}
-
-void media_snd_stop_pipeline(struct snd_usb_substream *subs)
-{
-        struct media_ctl *mctl = subs->media_ctl;
-
-        if (mctl)
-                media_snd_disable_source(mctl);
-}
-
-int media_snd_mixer_init(struct snd_usb_audio *chip)
-{
-        struct device *ctl_dev = &chip->card->ctl_dev;
-        struct media_intf_devnode *ctl_intf;
-        struct usb_mixer_interface *mixer;
-        struct media_device *mdev = chip->media_dev;
-        struct media_mixer_ctl *mctl;
-        u32 intf_type = MEDIA_INTF_T_ALSA_CONTROL;
-        int ret;
-
-        if (!mdev)
-                return -ENODEV;
-
-        ctl_intf = chip->ctl_intf_media_devnode;
-        if (!ctl_intf) {
-                ctl_intf = media_devnode_create(mdev, intf_type, 0,
-                                                MAJOR(ctl_dev->devt),
-                                                MINOR(ctl_dev->devt));
-                if (!ctl_intf)
-                        return -ENOMEM;
-                chip->ctl_intf_media_devnode = ctl_intf;
-        }
-
-        list_for_each_entry(mixer, &chip->mixer_list, list) {
-
-                if (mixer->media_mixer_ctl)
-                        continue;
-
-                /* allocate media_mixer_ctl */
-                mctl = kzalloc(sizeof(*mctl), GFP_KERNEL);
-                if (!mctl)
-                        return -ENOMEM;
-
-                mctl->media_dev = mdev;
-                mctl->media_entity.function = MEDIA_ENT_F_AUDIO_MIXER;
-                mctl->media_entity.name = chip->card->mixername;
-                mctl->media_pad[0].flags = MEDIA_PAD_FL_SINK;
-                mctl->media_pad[1].flags = MEDIA_PAD_FL_SOURCE;
-                mctl->media_pad[2].flags = MEDIA_PAD_FL_SOURCE;
-                media_entity_pads_init(&mctl->media_entity, MEDIA_MIXER_PAD_MAX,
-                                  mctl->media_pad);
-                ret =  media_device_register_entity(mctl->media_dev,
-                                                    &mctl->media_entity);
-                if (ret) {
-                        kfree(mctl);
-                        return ret;
-                }
-
-                mctl->intf_link = media_create_intf_link(&mctl->media_entity,
-                                                         &ctl_intf->intf,
-                                                         MEDIA_LNK_FL_ENABLED);
-                if (!mctl->intf_link) {
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                        kfree(mctl);
-                        return -ENOMEM;
-                }
-                mctl->intf_devnode = ctl_intf;
-                mixer->media_mixer_ctl = mctl;
-        }
-        return 0;
-}
-
-static void media_snd_mixer_delete(struct snd_usb_audio *chip)
-{
-        struct usb_mixer_interface *mixer;
-        struct media_device *mdev = chip->media_dev;
-
-        if (!mdev)
-                return;
-
-        list_for_each_entry(mixer, &chip->mixer_list, list) {
-                struct media_mixer_ctl *mctl;
-
-                mctl = mixer->media_mixer_ctl;
-                if (!mixer->media_mixer_ctl)
-                        continue;
-
-                if (media_devnode_is_registered(&mdev->devnode)) {
-                        media_device_unregister_entity(&mctl->media_entity);
-                        media_entity_cleanup(&mctl->media_entity);
-                }
-                kfree(mctl);
-                mixer->media_mixer_ctl = NULL;
-        }
-        if (media_devnode_is_registered(&mdev->devnode))
-                media_devnode_remove(chip->ctl_intf_media_devnode);
-        chip->ctl_intf_media_devnode = NULL;
-}
-
-int media_snd_device_create(struct snd_usb_audio *chip,
-                        struct usb_interface *iface)
-{
-        struct media_device *mdev;
-        struct usb_device *usbdev = interface_to_usbdev(iface);
-        int ret;
-
-        mdev = media_device_get_devres(&usbdev->dev);
-        if (!mdev)
-                return -ENOMEM;
-        if (!mdev->dev) {
-                /* register media device */
-                mdev->dev = &usbdev->dev;
-                if (usbdev->product)
-                        strlcpy(mdev->model, usbdev->product,
-                                sizeof(mdev->model));
-                if (usbdev->serial)
-                        strlcpy(mdev->serial, usbdev->serial,
-                                sizeof(mdev->serial));
-                strcpy(mdev->bus_info, usbdev->devpath);
-                mdev->hw_revision = le16_to_cpu(usbdev->descriptor.bcdDevice);
-                media_device_init(mdev);
-        }
-        if (!media_devnode_is_registered(&mdev->devnode)) {
-                ret = media_device_register(mdev);
-                if (ret) {
-                        dev_err(&usbdev->dev,
-                                "Couldn't register media device. Error: %d\n",
-                                ret);
-                        return ret;
-                }
-        }
-
-        /* save media device - avoid lookups */
-        chip->media_dev = mdev;
-
-        /* Create media entities for mixer and control dev */
-        ret = media_snd_mixer_init(chip);
-        if (ret) {
-                dev_err(&usbdev->dev,
-                        "Couldn't create media mixer entities. Error: %d\n",
-                        ret);
-
-                /* clear saved media_dev */
-                chip->media_dev = NULL;
-
-                return ret;
-        }
-        return 0;
-}
-
-void media_snd_device_delete(struct snd_usb_audio *chip)
-{
-        struct media_device *mdev = chip->media_dev;
-
-        media_snd_mixer_delete(chip);
-
-        if (mdev) {
-                if (media_devnode_is_registered(&mdev->devnode))
-                        media_device_unregister(mdev);
-                chip->media_dev = NULL;
-        }
-}
diff --git a/sound/usb/media.h b/sound/usb/media.h
deleted file mode 100644
index 1dcdcdc5f7aa..000000000000
--- a/sound/usb/media.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * media.h - Media Controller specific ALSA driver code
- *
- * Copyright (c) 2016 Shuah Khan <shuahkh@osg.samsung.com>
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * This file is released under the GPLv2.
- */
-
-/*
- * This file adds Media Controller support to ALSA driver
- * to use the Media Controller API to share tuner with DVB
- * and V4L2 drivers that control media device. Media device
- * is created based on existing quirks framework. Using this
- * approach, the media controller API usage can be added for
- * a specific device.
-*/
-#ifndef __MEDIA_H
-
-#ifdef CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER
-
-#include <media/media-device.h>
-#include <media/media-entity.h>
-#include <sound/asound.h>
-
-struct media_ctl {
-        struct media_device *media_dev;
-        struct media_entity media_entity;
-        struct media_intf_devnode *intf_devnode;
-        struct media_link *intf_link;
-        struct media_pad media_pad;
-        struct media_pipeline media_pipe;
-};
-
-/*
- * One source pad each for SNDRV_PCM_STREAM_CAPTURE and
- * SNDRV_PCM_STREAM_PLAYBACK. One for sink pad to link
- * to AUDIO Source
-*/
-#define MEDIA_MIXER_PAD_MAX    (SNDRV_PCM_STREAM_LAST + 2)
-
-struct media_mixer_ctl {
-        struct media_device *media_dev;
-        struct media_entity media_entity;
-        struct media_intf_devnode *intf_devnode;
-        struct media_link *intf_link;
-        struct media_pad media_pad[MEDIA_MIXER_PAD_MAX];
-        struct media_pipeline media_pipe;
-};
-
-int media_snd_device_create(struct snd_usb_audio *chip,
-                            struct usb_interface *iface);
-void media_snd_device_delete(struct snd_usb_audio *chip);
-int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
-                          int stream);
-void media_snd_stream_delete(struct snd_usb_substream *subs);
-int media_snd_start_pipeline(struct snd_usb_substream *subs);
-void media_snd_stop_pipeline(struct snd_usb_substream *subs);
-#else
-static inline int media_snd_device_create(struct snd_usb_audio *chip,
-                                          struct usb_interface *iface)
-                                                { return 0; }
-static inline void media_snd_device_delete(struct snd_usb_audio *chip) { }
-static inline int media_snd_stream_init(struct snd_usb_substream *subs,
-                                        struct snd_pcm *pcm, int stream)
-                                                { return 0; }
-static inline void media_snd_stream_delete(struct snd_usb_substream *subs) { }
-static inline int media_snd_start_pipeline(struct snd_usb_substream *subs)
-                                        { return 0; }
-static inline void media_snd_stop_pipeline(struct snd_usb_substream *subs) { }
-#endif
-#endif /* __MEDIA_H */
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index f3789446ab9c..3417ef347e40 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,8 +3,6 @@
 
 #include <sound/info.h>
 
-struct media_mixer_ctl;
-
 struct usb_mixer_interface {
         struct snd_usb_audio *chip;
         struct usb_host_interface *hostif;
@@ -24,7 +22,6 @@ struct usb_mixer_interface {
         struct urb *rc_urb;
         struct usb_ctrlrequest *rc_setup_packet;
         u8 rc_buffer[6];
-        struct media_mixer_ctl *media_mixer_ctl;
 };
 
 #define MAX_CHANNELS    16      /* max logical channels */
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 0e4e0640c504..44d178ee9177 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -35,7 +35,6 @@
 #include "pcm.h"
 #include "clock.h"
 #include "power.h"
-#include "media.h"
 
 #define SUBSTREAM_FLAG_DATA_EP_STARTED  0
 #define SUBSTREAM_FLAG_SYNC_EP_STARTED  1
@@ -718,14 +717,10 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
         struct audioformat *fmt;
         int ret;
 
-        ret = media_snd_start_pipeline(subs);
-        if (ret)
-                return ret;
-
         ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,
                                                params_buffer_bytes(hw_params));
         if (ret < 0)
-                goto err_ret;
+                return ret;
 
         subs->pcm_format = params_format(hw_params);
         subs->period_bytes = params_period_bytes(hw_params);
@@ -739,27 +734,22 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
                 dev_dbg(&subs->dev->dev,
                         "cannot set format: format = %#x, rate = %d, channels = %d\n",
                            subs->pcm_format, subs->cur_rate, subs->channels);
-                ret = -EINVAL;
-                goto err_ret;
+                return -EINVAL;
         }
 
         ret = snd_usb_lock_shutdown(subs->stream->chip);
         if (ret < 0)
-                goto err_ret;
+                return ret;
         ret = set_format(subs, fmt);
         snd_usb_unlock_shutdown(subs->stream->chip);
         if (ret < 0)
-                goto err_ret;
+                return ret;
 
         subs->interface = fmt->iface;
         subs->altset_idx = fmt->altset_idx;
         subs->need_setup_ep = true;
 
         return 0;
-
-err_ret:
-        media_snd_stop_pipeline(subs);
-        return ret;
 }
 
 /*
@@ -771,7 +761,6 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream)
 {
         struct snd_usb_substream *subs = substream->runtime->private_data;
 
-        media_snd_stop_pipeline(subs);
         subs->cur_audiofmt = NULL;
         subs->cur_rate = 0;
         subs->period_bytes = 0;
@@ -1232,7 +1221,6 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
         struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_usb_substream *subs = &as->substream[direction];
-        int ret;
 
         subs->interface = -1;
         subs->altset_idx = 0;
@@ -1246,12 +1234,7 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
         subs->dsd_dop.channel = 0;
         subs->dsd_dop.marker = 1;
 
-        ret = setup_hw_info(runtime, subs);
-        if (ret == 0)
-                ret = media_snd_stream_init(subs, as->pcm, direction);
-        if (ret)
-                snd_usb_autosuspend(subs->stream->chip);
-        return ret;
+        return setup_hw_info(runtime, subs);
 }
 
 static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
@@ -1260,7 +1243,6 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
         struct snd_usb_substream *subs = &as->substream[direction];
 
         stop_endpoints(subs, true);
-        media_snd_stop_pipeline(subs);
 
         if (subs->interface >= 0 &&
             !snd_usb_lock_shutdown(subs->stream->chip)) {
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 9d087b19c70c..c60a776e815d 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2886,7 +2886,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .product_name = pname, \
                 .ifnum = QUIRK_ANY_INTERFACE, \
                 .type = QUIRK_AUDIO_ALIGN_TRANSFER, \
-                .media_device = 1, \
         } \
 }
 
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 0adfd9537cf7..7b6dca2d7488 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -1138,7 +1138,9 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
         case USB_ID(0x047F, 0xAA05): /* Plantronics DA45 */
         case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
         case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
+        case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */
         case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */
+        case USB_ID(0x1de7, 0x0114): /* Phoenix Audio MT202pcs */
         case USB_ID(0x21B4, 0x0081): /* AudioQuest DragonFly */
                 return true;
         }
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 6fe7f210bd4e..8e9548bc1f1a 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -36,7 +36,6 @@
 #include "format.h"
 #include "clock.h"
 #include "stream.h"
-#include "media.h"
 
 /*
  * free a substream
@@ -53,7 +52,6 @@ static void free_substream(struct snd_usb_substream *subs)
                 kfree(fp);
         }
         kfree(subs->rate_list.list);
-        media_snd_stream_delete(subs);
 }
 
 
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 89b6853030de..4d5c89a7ba2b 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -30,9 +30,6 @@
  *
  */
 
-struct media_device;
-struct media_intf_devnode;
-
 struct snd_usb_audio {
         int index;
         struct usb_device *dev;
@@ -64,8 +61,6 @@ struct snd_usb_audio {
         bool autoclock;                 /* from the 'autoclock' module param */
 
         struct usb_host_interface *ctrl_intf;   /* the audio control interface */
-        struct media_device *media_dev;
-        struct media_intf_devnode *ctl_intf_media_devnode;
 };
 
 #define usb_audio_err(chip, fmt, args...) \
@@ -116,7 +111,6 @@ struct snd_usb_audio_quirk {
         const char *product_name;
         int16_t ifnum;
         uint16_t type;
-        bool media_device;
         const void *data;
 };