ASoC: rt5682: Remove HP volume control

shumingfan · broonie · commit 3f24f37adbc9 · 2018-09-18T10:29:47.000-07:00
This patch removed Headphone Playback Volume control.
Due to codec settings, we don't want the user to change HP analog gain.
The user could use DAC1 Playback Volume control to
change playback volume.

Signed-off-by: Shuming Fan &lt;shumingf@realtek.com&gt;
Signed-off-by: Mark Brown &lt;broonie@kernel.org&gt;
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
@@ -749,7 +749,6 @@ static bool rt5682_readable_register(struct device *dev, unsigned int reg)
 	}
 }
 
-static const DECLARE_TLV_DB_SCALE(hp_vol_tlv, -2250, 150, 0);
 static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);
 static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);
 static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
@@ -1108,10 +1107,6 @@ static void rt5682_jack_detect_handler(struct work_struct *work)
 }
 
 static const struct snd_kcontrol_new rt5682_snd_controls[] = {
-	/* Headphone Output Volume */
-	SOC_DOUBLE_R_TLV("Headphone Playback Volume", RT5682_HPL_GAIN,
-		RT5682_HPR_GAIN, RT5682_G_HP_SFT, 15, 1, hp_vol_tlv),
-
 	/* DAC Digital Volume */
 	SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5682_DAC1_DIG_VOL,
 		RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 86, 0, dac_vol_tlv),

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,6 @@ static bool rt5682_readable_register(struct device *dev, unsigned int reg)`
`749`	`749`	`}`
`750`	`750`	`}`
`751`	`751`
`752`		`-static const DECLARE_TLV_DB_SCALE(hp_vol_tlv, -2250, 150, 0);`
`753`	`752`	`static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);`
`754`	`753`	`static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);`
`755`	`754`	`static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);`
`@@ -1108,10 +1107,6 @@ static void rt5682_jack_detect_handler(struct work_struct *work)`
`1108`	`1107`	`}`
`1109`	`1108`
`1110`	`1109`	`static const struct snd_kcontrol_new rt5682_snd_controls[] = {`
`1111`		`- /* Headphone Output Volume */`
`1112`		`- SOC_DOUBLE_R_TLV("Headphone Playback Volume", RT5682_HPL_GAIN,`
`1113`		`- RT5682_HPR_GAIN, RT5682_G_HP_SFT, 15, 1, hp_vol_tlv),`
`1114`		`-`
`1115`	`1110`	`/* DAC Digital Volume */`
`1116`	`1111`	`SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5682_DAC1_DIG_VOL,`
`1117`	`1112`	`RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 86, 0, dac_vol_tlv),`