FAILED: patch "[PATCH] ASoC: rt5682: Change DAC/ADC volume scale" failed to apply to 4.18-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 4.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
7509487785d7a2bf3606cf26710f0ca29e9ca94dMon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Fri, 24 Aug 2018 10:52:19 +0800
Subject: [PATCH] ASoC: rt5682: Change DAC/ADC volume scale
The step of DAC/ADC volume scale changes from 0.375dB to 0.75dB
Signed-off-by Shuming Fan <[email protected]>
Signed-off-by Mark Brown <[email protected]>
sound/soc/codecs/rt5682.c +4 -4
@@ -750,8 +750,8 @@ 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, -65625, 375, 0); -static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 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);/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
@@ -1114,7 +1114,7 @@ static const struct snd_kcontrol_new rt5682_snd_controls[] = {/* DAC Digital Volume */ SOC_DOUBLE_TLV ("DAC1 Playback Volume" ,RT5682_DAC1_DIG_VOL , -RT5682_L_VOL_SFT ,RT5682_R_VOL_SFT ,175 ,0 , dac_vol_tlv), +RT5682_L_VOL_SFT +1 ,RT5682_R_VOL_SFT +1 ,86 ,0 , dac_vol_tlv),/* IN Boost Volume */ SOC_SINGLE_TLV("CBJ Boost Volume", RT5682_CBJ_BST_CTRL,
@@ -1124,7 +1124,7 @@ static const struct snd_kcontrol_new rt5682_snd_controls[] = {SOC_DOUBLE ("STO1 ADC Capture Switch" ,RT5682_STO1_ADC_DIG_VOL ,RT5682_L_MUTE_SFT ,RT5682_R_MUTE_SFT ,1 ,1 ),SOC_DOUBLE_TLV ("STO1 ADC Capture Volume" ,RT5682_STO1_ADC_DIG_VOL , -RT5682_L_VOL_SFT ,RT5682_R_VOL_SFT ,127 ,0 , adc_vol_tlv), +RT5682_L_VOL_SFT +1 ,RT5682_R_VOL_SFT +1 ,63 ,0 , adc_vol_tlv),/* ADC Boost Volume Control */ SOC_DOUBLE_TLV("STO1 ADC Boost Gain Volume", RT5682_STO1_ADC_BOOST,