Backmerge tag 'v4.7' into drm-next

Linux 4.7

As requested by Daniel Vetter as the conflicts were getting messy.

24 files changed, 145 insertions, 36 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index a85d45595d02..b4fe9b002512 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -160,6 +160,8 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask,
         
         if (snd_BUG_ON(!card || !id))
                 return;
+        if (card->shutdown)
+                return;
         read_lock(&card->ctl_files_rwlock);
 #if IS_ENABLED(CONFIG_SND_MIXER_OSS)
         card->mixer_oss_change_count++;
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 308c9ecf73db..8e980aa678d0 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -849,6 +849,14 @@ int snd_pcm_new_internal(struct snd_card *card, const char *id, int device,
 }
 EXPORT_SYMBOL(snd_pcm_new_internal);
 
+static void free_chmap(struct snd_pcm_str *pstr)
+{
+        if (pstr->chmap_kctl) {
+                snd_ctl_remove(pstr->pcm->card, pstr->chmap_kctl);
+                pstr->chmap_kctl = NULL;
+        }
+}
+
 static void snd_pcm_free_stream(struct snd_pcm_str * pstr)
 {
         struct snd_pcm_substream *substream, *substream_next;
@@ -871,6 +879,7 @@ static void snd_pcm_free_stream(struct snd_pcm_str * pstr)
                 kfree(setup);
         }
 #endif
+        free_chmap(pstr);
         if (pstr->substream_count)
                 put_device(&pstr->dev);
 }
@@ -1135,10 +1144,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)
         for (cidx = 0; cidx < 2; cidx++) {
                 if (!pcm->internal)
                         snd_unregister_device(&pcm->streams[cidx].dev);
-                if (pcm->streams[cidx].chmap_kctl) {
-                        snd_ctl_remove(pcm->card, pcm->streams[cidx].chmap_kctl);
-                        pcm->streams[cidx].chmap_kctl = NULL;
-                }
+                free_chmap(&pcm->streams[cidx]);
         }
         mutex_unlock(&pcm->open_mutex);
         mutex_unlock(&register_mutex);
diff --git a/sound/core/timer.c b/sound/core/timer.c
index e722022d325d..9a6157ea6881 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1955,6 +1955,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
 
                 qhead = tu->qhead++;
                 tu->qhead %= tu->queue_size;
+                tu->qused--;
                 spin_unlock_irq(&tu->qlock);
 
                 if (tu->tread) {
@@ -1968,7 +1969,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
                 }
 
                 spin_lock_irq(&tu->qlock);
-                tu->qused--;
                 if (err < 0)
                         goto _error;
                 result += unit;
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 4a054d720112..d3125c169684 100644
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -1444,9 +1444,8 @@ static int vortex_wtdma_bufshift(vortex_t * vortex, int wtdma)
         int page, p, pp, delta, i;
 
         page =
-            (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2)) &
-             WT_SUBBUF_MASK)
-            >> WT_SUBBUF_SHIFT;
+            (hwread(vortex->mmio, VORTEX_WTDMA_STAT + (wtdma << 2))
+             >> WT_SUBBUF_SHIFT) & WT_SUBBUF_MASK;
         if (dma->nr_periods >= 4)
                 delta = (page - dma->period_real) & 3;
         else {
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 1cb85aeb0cea..286f5e3686a3 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -2200,11 +2200,11 @@ static int snd_echo_resume(struct device *dev)
         u32 pipe_alloc_mask;
         int err;
 
-        commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);
+        commpage_bak = kmalloc(sizeof(*commpage), GFP_KERNEL);
         if (commpage_bak == NULL)
                 return -ENOMEM;
         commpage = chip->comm_page;
-        memcpy(commpage_bak, commpage, sizeof(struct comm_page));
+        memcpy(commpage_bak, commpage, sizeof(*commpage));
 
         err = init_hw(chip, chip->pci->device, chip->pci->subsystem_device);
         if (err < 0) {
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 320445f3bf73..79c7b340acc2 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -3977,6 +3977,8 @@ static hda_nid_t set_path_power(struct hda_codec *codec, hda_nid_t nid,
 
         for (n = 0; n < spec->paths.used; n++) {
                 path = snd_array_elem(&spec->paths, n);
+                if (!path->depth)
+                        continue;
                 if (path->path[0] == nid ||
                     path->path[path->depth - 1] == nid) {
                         bool pin_old = path->pin_enabled;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 94089fc71884..6f8ea13323c1 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -367,9 +367,10 @@ enum {
 #define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70)
 #define IS_KBL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa171)
 #define IS_KBL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d71)
+#define IS_KBL_H(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa2f0)
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
 #define IS_SKL_PLUS(pci) (IS_SKL(pci) || IS_SKL_LP(pci) || IS_BXT(pci)) || \
-                        IS_KBL(pci) || IS_KBL_LP(pci)
+                        IS_KBL(pci) || IS_KBL_LP(pci) || IS_KBL_H(pci)
 
 static char *driver_short_names[] = {
         [AZX_DRIVER_ICH] = "HDA Intel",
@@ -1217,8 +1218,10 @@ static int azx_free(struct azx *chip)
         if (use_vga_switcheroo(hda)) {
                 if (chip->disabled && hda->probe_continued)
                         snd_hda_unlock_devices(&chip->bus);
-                if (hda->vga_switcheroo_registered)
+                if (hda->vga_switcheroo_registered) {
                         vga_switcheroo_unregister_client(chip->pci);
+                        vga_switcheroo_fini_domain_pm_ops(chip->card->dev);
+                }
         }
 
         if (bus->chip_init) {
@@ -2190,6 +2193,9 @@ static const struct pci_device_id azx_ids[] = {
         /* Kabylake-LP */
         { PCI_DEVICE(0x8086, 0x9d71),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
+        /* Kabylake-H */
+        { PCI_DEVICE(0x8086, 0xa2f0),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_SKYLAKE },
         /* Broxton-P(Apollolake) */
         { PCI_DEVICE(0x8086, 0x5a98),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_BROXTON },
@@ -2263,6 +2269,8 @@ static const struct pci_device_id azx_ids[] = {
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
         { PCI_DEVICE(0x1002, 0x157a),
           .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
+        { PCI_DEVICE(0x1002, 0x15b3),
+          .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
         { PCI_DEVICE(0x1002, 0x793b),
           .driver_data = AZX_DRIVER_ATIHDMI | AZX_DCAPS_PRESET_ATI_HDMI },
         { PCI_DEVICE(0x1002, 0x7919),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 900bfbc3368c..abcb5a6a1cd9 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5651,6 +5651,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x504a, "ThinkPad X260", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x504b, "Thinkpad", ALC293_FIXUP_LENOVO_SPK_NOISE),
         SND_PCI_QUIRK(0x17aa, 0x5050, "Thinkpad T560p", ALC292_FIXUP_TPT460),
+        SND_PCI_QUIRK(0x17aa, 0x5051, "Thinkpad L460", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x5053, "Thinkpad T460", ALC292_FIXUP_TPT460),
         SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
@@ -5737,7 +5738,6 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {}
 };
 #define ALC225_STANDARD_PINS \
-        {0x12, 0xb7a60130}, \
         {0x21, 0x04211020}
 
 #define ALC256_STANDARD_PINS \
@@ -5762,10 +5762,24 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
 static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
         SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
                 ALC225_STANDARD_PINS,
+                {0x12, 0xb7a60130},
                 {0x14, 0x901701a0}),
         SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
                 ALC225_STANDARD_PINS,
+                {0x12, 0xb7a60130},
                 {0x14, 0x901701b0}),
+        SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
+                ALC225_STANDARD_PINS,
+                {0x12, 0xb7a60150},
+                {0x14, 0x901701a0}),
+        SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
+                ALC225_STANDARD_PINS,
+                {0x12, 0xb7a60150},
+                {0x14, 0x901701b0}),
+        SND_HDA_PIN_QUIRK(0x10ec0225, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
+                ALC225_STANDARD_PINS,
+                {0x12, 0xb7a60130},
+                {0x1b, 0x90170110}),
         SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell", ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
                 {0x14, 0x90170110},
                 {0x21, 0x02211020}),
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 4d82a58ff6b0..f3fb98f0a995 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -483,9 +483,10 @@ config SND_SOC_DMIC
         tristate
 
 config SND_SOC_HDMI_CODEC
-       tristate
-       select SND_PCM_ELD
-       select SND_PCM_IEC958
+        tristate
+        select SND_PCM_ELD
+        select SND_PCM_IEC958
+        select HDMI
 
 config SND_SOC_ES8328
         tristate "Everest Semi ES8328 CODEC"
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 647f69de6baa..5013d2ba0c10 100644
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -146,6 +146,7 @@ static const struct regmap_config ak4613_regmap_cfg = {
         .max_register           = 0x16,
         .reg_defaults           = ak4613_reg,
         .num_reg_defaults       = ARRAY_SIZE(ak4613_reg),
+        .cache_type             = REGCACHE_RBTREE,
 };
 
 static const struct of_device_id ak4613_of_match[] = {
@@ -530,7 +531,6 @@ static int ak4613_i2c_remove(struct i2c_client *client)
 static struct i2c_driver ak4613_i2c_driver = {
         .driver = {
                 .name = "ak4613-codec",
-                .owner = THIS_MODULE,
                 .of_match_table = ak4613_of_match,
         },
         .probe          = ak4613_i2c_probe,
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index d6f4abbbf8a7..fb3885fe0afb 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -226,6 +226,7 @@ static int v253_open(struct tty_struct *tty)
         if (!tty->disc_data)
                 return -ENODEV;
 
+        tty->receive_room = 16;
         if (tty->ops->write(tty, v253_init, len) != len) {
                 ret = -EIO;
                 goto err;
diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 181cd3bf0b92..2abb742fc47b 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -1474,6 +1474,11 @@ static int hdmi_codec_probe(struct snd_soc_codec *codec)
          * exit, we call pm_runtime_suspend() so that will do for us
          */
         hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdac.dev));
+        if (!hlink) {
+                dev_err(&edev->hdac.dev, "hdac link not found\n");
+                return -EIO;
+        }
+
         snd_hdac_ext_bus_link_get(edev->ebus, hlink);
 
         ret = create_fill_widget_route_map(dapm);
@@ -1634,6 +1639,11 @@ static int hdac_hdmi_dev_probe(struct hdac_ext_device *edev)
 
         /* hold the ref while we probe */
         hlink = snd_hdac_ext_bus_get_link(edev->ebus, dev_name(&edev->hdac.dev));
+        if (!hlink) {
+                dev_err(&edev->hdac.dev, "hdac link not found\n");
+                return -EIO;
+        }
+
         snd_hdac_ext_bus_link_get(edev->ebus, hlink);
 
         hdmi_priv = devm_kzalloc(&codec->dev, sizeof(*hdmi_priv), GFP_KERNEL);
@@ -1744,6 +1754,11 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
         }
 
         hlink = snd_hdac_ext_bus_get_link(ebus, dev_name(dev));
+        if (!hlink) {
+                dev_err(dev, "hdac link not found\n");
+                return -EIO;
+        }
+
         snd_hdac_ext_bus_link_put(ebus, hlink);
 
         return 0;
@@ -1765,6 +1780,11 @@ static int hdac_hdmi_runtime_resume(struct device *dev)
                 return 0;
 
         hlink = snd_hdac_ext_bus_get_link(ebus, dev_name(dev));
+        if (!hlink) {
+                dev_err(dev, "hdac link not found\n");
+                return -EIO;
+        }
+
         snd_hdac_ext_bus_link_get(ebus, hlink);
 
         err = snd_hdac_display_power(bus, true);
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 3c6594da6c9c..d70847c9eeb0 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -253,7 +253,7 @@ static const struct reg_default rt5650_reg[] = {
         { 0x2b, 0x5454 },
         { 0x2c, 0xaaa0 },
         { 0x2d, 0x0000 },
-        { 0x2f, 0x1002 },
+        { 0x2f, 0x5002 },
         { 0x31, 0x5000 },
         { 0x32, 0x0000 },
         { 0x33, 0x0000 },
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 49a9e7049e2b..0af5ddbef1da 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -619,7 +619,7 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = {
                 RT5670_L_MUTE_SFT, RT5670_R_MUTE_SFT, 1, 1),
         SOC_DOUBLE_TLV("HP Playback Volume", RT5670_HP_VOL,
                 RT5670_L_VOL_SFT, RT5670_R_VOL_SFT,
-                39, 0, out_vol_tlv),
+                39, 1, out_vol_tlv),
         /* OUTPUT Control */
         SOC_DOUBLE("OUT Channel Switch", RT5670_LOUT1,
                 RT5670_VOL_L_SFT, RT5670_VOL_R_SFT, 1, 1),
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index da60e3fe5ee7..e7fe6b7b95b7 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1872,7 +1872,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
                 .capture = {
                         .stream_name = "Audio Trace CPU",
                         .channels_min = 1,
-                        .channels_max = 6,
+                        .channels_max = 4,
                         .rates = WM5102_RATES,
                         .formats = WM5102_FORMATS,
                 },
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index b5820e4d5471..d54f1b46c9ec 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1723,6 +1723,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
         { "OUT2L", NULL, "SYSCLK" },
         { "OUT2R", NULL, "SYSCLK" },
         { "OUT3L", NULL, "SYSCLK" },
+        { "OUT3R", NULL, "SYSCLK" },
         { "OUT4L", NULL, "SYSCLK" },
         { "OUT4R", NULL, "SYSCLK" },
         { "OUT5L", NULL, "SYSCLK" },
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index f6f9395ea38e..1c600819f768 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -743,6 +743,7 @@ static const struct regmap_config wm8940_regmap = {
         .max_register = WM8940_MONOMIX,
         .reg_defaults = wm8940_reg_defaults,
         .num_reg_defaults = ARRAY_SIZE(wm8940_reg_defaults),
+        .cache_type = REGCACHE_RBTREE,
 
         .readable_reg = wm8940_readable_register,
         .volatile_reg = wm8940_volatile_register,
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 0f66fda2c772..237dc67002ef 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1513,8 +1513,9 @@ static struct davinci_mcasp_pdata am33xx_mcasp_pdata = {
 };
 
 static struct davinci_mcasp_pdata dra7_mcasp_pdata = {
-        .tx_dma_offset = 0x200,
-        .rx_dma_offset = 0x284,
+        /* The CFG port offset will be calculated if it is needed */
+        .tx_dma_offset = 0,
+        .rx_dma_offset = 0,
         .version = MCASP_VERSION_4,
 };
 
@@ -1734,6 +1735,52 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp)
         return PCM_EDMA;
 }
 
+static u32 davinci_mcasp_txdma_offset(struct davinci_mcasp_pdata *pdata)
+{
+        int i;
+        u32 offset = 0;
+
+        if (pdata->version != MCASP_VERSION_4)
+                return pdata->tx_dma_offset;
+
+        for (i = 0; i < pdata->num_serializer; i++) {
+                if (pdata->serial_dir[i] == TX_MODE) {
+                        if (!offset) {
+                                offset = DAVINCI_MCASP_TXBUF_REG(i);
+                        } else {
+                                pr_err("%s: Only one serializer allowed!\n",
+                                       __func__);
+                                break;
+                        }
+                }
+        }
+
+        return offset;
+}
+
+static u32 davinci_mcasp_rxdma_offset(struct davinci_mcasp_pdata *pdata)
+{
+        int i;
+        u32 offset = 0;
+
+        if (pdata->version != MCASP_VERSION_4)
+                return pdata->rx_dma_offset;
+
+        for (i = 0; i < pdata->num_serializer; i++) {
+                if (pdata->serial_dir[i] == RX_MODE) {
+                        if (!offset) {
+                                offset = DAVINCI_MCASP_RXBUF_REG(i);
+                        } else {
+                                pr_err("%s: Only one serializer allowed!\n",
+                                       __func__);
+                                break;
+                        }
+                }
+        }
+
+        return offset;
+}
+
 static int davinci_mcasp_probe(struct platform_device *pdev)
 {
         struct snd_dmaengine_dai_dma_data *dma_data;
@@ -1862,7 +1909,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         if (dat)
                 dma_data->addr = dat->start;
         else
-                dma_data->addr = mem->start + pdata->tx_dma_offset;
+                dma_data->addr = mem->start + davinci_mcasp_txdma_offset(pdata);
 
         dma = &mcasp->dma_request[SNDRV_PCM_STREAM_PLAYBACK];
         res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
@@ -1883,7 +1930,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                 if (dat)
                         dma_data->addr = dat->start;
                 else
-                        dma_data->addr = mem->start + pdata->rx_dma_offset;
+                        dma_data->addr =
+                                mem->start + davinci_mcasp_rxdma_offset(pdata);
 
                 dma = &mcasp->dma_request[SNDRV_PCM_STREAM_CAPTURE];
                 res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 1e8787fb3fb7..afddc8010c54 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -85,9 +85,9 @@
                                                 (n << 2))
 
 /* Transmit Buffer for Serializer n */
-#define DAVINCI_MCASP_TXBUF_REG         0x200
+#define DAVINCI_MCASP_TXBUF_REG(n)      (0x200 + (n << 2))
 /* Receive Buffer for Serializer n */
-#define DAVINCI_MCASP_RXBUF_REG         0x280
+#define DAVINCI_MCASP_RXBUF_REG(n)      (0x280 + (n << 2))
 
 /* McASP FIFO Registers */
 #define DAVINCI_MCASP_V2_AFIFO_BASE     (0x1010)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 632ecc0e3956..bedec4a32581 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -952,16 +952,16 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
         ssi_private->i2s_mode = CCSR_SSI_SCR_NET;
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_I2S:
+                regmap_update_bits(regs, CCSR_SSI_STCCR,
+                                   CCSR_SSI_SxCCR_DC_MASK,
+                                   CCSR_SSI_SxCCR_DC(2));
+                regmap_update_bits(regs, CCSR_SSI_SRCCR,
+                                   CCSR_SSI_SxCCR_DC_MASK,
+                                   CCSR_SSI_SxCCR_DC(2));
                 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
                 case SND_SOC_DAIFMT_CBM_CFS:
                 case SND_SOC_DAIFMT_CBS_CFS:
                         ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER;
-                        regmap_update_bits(regs, CCSR_SSI_STCCR,
-                                        CCSR_SSI_SxCCR_DC_MASK,
-                                        CCSR_SSI_SxCCR_DC(2));
-                        regmap_update_bits(regs, CCSR_SSI_SRCCR,
-                                        CCSR_SSI_SxCCR_DC_MASK,
-                                        CCSR_SSI_SxCCR_DC(2));
                         break;
                 case SND_SOC_DAIFMT_CBM_CFM:
                         ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
diff --git a/sound/soc/intel/atom/sst-mfld-platform-compress.c b/sound/soc/intel/atom/sst-mfld-platform-compress.c
index 395168986462..1bead81bb510 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-compress.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-compress.c
@@ -182,24 +182,29 @@ static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)
         case SNDRV_PCM_TRIGGER_START:
                 if (stream->compr_ops->stream_start)
                         return stream->compr_ops->stream_start(sst->dev, stream->id);
+                break;
         case SNDRV_PCM_TRIGGER_STOP:
                 if (stream->compr_ops->stream_drop)
                         return stream->compr_ops->stream_drop(sst->dev, stream->id);
+                break;
         case SND_COMPR_TRIGGER_DRAIN:
                 if (stream->compr_ops->stream_drain)
                         return stream->compr_ops->stream_drain(sst->dev, stream->id);
+                break;
         case SND_COMPR_TRIGGER_PARTIAL_DRAIN:
                 if (stream->compr_ops->stream_partial_drain)
                         return stream->compr_ops->stream_partial_drain(sst->dev, stream->id);
+                break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
                 if (stream->compr_ops->stream_pause)
                         return stream->compr_ops->stream_pause(sst->dev, stream->id);
+                break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
                 if (stream->compr_ops->stream_pause_release)
                         return stream->compr_ops->stream_pause_release(sst->dev, stream->id);
-        default:
-                return -EINVAL;
+                break;
         }
+        return -EINVAL;
 }
 
 static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c
index 965ce40ce752..8b95e09e23e8 100644
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
@@ -291,6 +291,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,
         sst_dsp_mailbox_init(sst, (BXT_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ),
                         SKL_ADSP_W0_UP_SZ, BXT_ADSP_SRAM1_BASE, SKL_ADSP_W1_SZ);
 
+        INIT_LIST_HEAD(&sst->module_list);
         ret = skl_ipc_init(dev, skl);
         if (ret)
                 return ret;
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 49354d17ea55..c4c51a4d3c8f 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -518,7 +518,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
                 }
         }
 
-        rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr);
+        rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);
         rsnd_mod_write(adg_mod, BRRA,  rbga);
         rsnd_mod_write(adg_mod, BRRB,  rbgb);
 
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 69860da473ea..9e5276d6dda0 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -556,7 +556,6 @@ static int usb_audio_probe(struct usb_interface *intf,
                                 goto __error;
                         }
                         chip = usb_chip[i];
-                        dev_set_drvdata(&dev->dev, chip);
                         atomic_inc(&chip->active); /* avoid autopm */
                         break;
                 }
@@ -582,6 +581,7 @@ static int usb_audio_probe(struct usb_interface *intf,
                         goto __error;
                 }
         }
+        dev_set_drvdata(&dev->dev, chip);
 
         /*
          * For devices with more than one control interface, we assume the