From: Mark Brown <broonie@kernel.org>
Date: Fri, 27 Mar 2020 16:04:55 +0000 (+0000)
Subject: Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8c0b6e150c5b1e6359e4f478d9fa4aaae345979d;p=linux.git

Merge branch 'for-5.6' of https://git./linux/kernel/git/broonie/sound into asoc-5.7
---

8c0b6e150c5b1e6359e4f478d9fa4aaae345979d
diff --cc sound/soc/codecs/tas2562.c
index 6b7f7a18da364,fb2233ca9103f..7fae88655a0fa
--- a/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[] = {