Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/codecs/rt5682.c
Simple merge

diff --cc sound/soc/codecs/rt5682.h
Simple merge

diff --cc sound/soc/codecs/tas2562.c
index 6b7f7a1,fb2233c..7fae886
--- 1/sound/soc/codecs/tas2562.c
--- 2/sound/soc/codecs/tas2562.c
+++ b/sound/soc/codecs/tas2562.c
@@@ -493,19 -409,8 +493,19 @@@ static const struct snd_kcontrol_new vs
                        1, 1);
  
  static const struct snd_kcontrol_new tas2562_snd_controls[] = {
-       SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 0, 0x1c, 0,
+       SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 1, 0x1c, 0,
                       tas2562_dac_tlv),
 +      {
 +              .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
 +              .name = "Digital Volume Control",
 +              .index = 0,
 +              .tlv.p = dvc_tlv,
 +              .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,
 +              .info = snd_soc_info_volsw,
 +              .get = tas2562_volume_control_get,
 +              .put = tas2562_volume_control_put,
 +              .private_value = SOC_SINGLE_VALUE(TAS2562_DVC_CFG1, 0, 110, 0, 0) ,
 +      },
  };
  
  static const struct snd_soc_dapm_widget tas2562_dapm_widgets[] = {

diff --cc sound/soc/codecs/wsa881x.c
Simple merge

diff --cc sound/soc/intel/boards/bdw-rt5650.c
Simple merge

diff --cc sound/soc/intel/boards/bdw-rt5677.c
Simple merge

diff --cc sound/soc/intel/boards/broadwell.c
Simple merge

diff --cc sound/soc/stm/stm32_spdifrx.c
Simple merge