diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
| commit | 90fbeb0cabf75e7ab04f4a13a237cd8ccb4544d9 (patch) | |
| tree | f8d540943df9eaaba2001bcaa257624074d89441 /sound/soc/codecs/rt5682.c | |
| parent | bf0fa00fd8410b377a3403adb58e32fc703e86e8 (diff) | |
| parent | 3f24f37adbc9a1059420a9c8f857e3490a4bce5e (diff) | |
| download | linux-90fbeb0cabf75e7ab04f4a13a237cd8ccb4544d9.tar.bz2 | |
Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps.
Diffstat (limited to 'sound/soc/codecs/rt5682.c')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 83202e9e5abd..7213b1cfb18a 100644 --- 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), |