Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177e1e1f authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: rt5645: make volume TLV closer to reality 



The volume blocks have an step of 0.375dB, but TLV uses 0.01dB for
units.  Only use the resolution supported, ignoring the LSB of the
volume register.  This results in half the steps and 0.75dB per step,
but reports accurate levels through TLV.

Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21ab3f2b

sound/soc/codecs/rt5645.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -417,9 +417,9 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg) 
}

}





static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);

static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);

static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0);

static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);

static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);

static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);

static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 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);

static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);





/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */

/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
@@ -459,9 +459,9 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { 
	SOC_DOUBLE("DAC2 Playback Switch", RT5645_DAC_CTRL,

	SOC_DOUBLE("DAC2 Playback Switch", RT5645_DAC_CTRL,

		RT5645_M_DAC_L2_VOL_SFT, RT5645_M_DAC_R2_VOL_SFT, 1, 1),

		RT5645_M_DAC_L2_VOL_SFT, RT5645_M_DAC_R2_VOL_SFT, 1, 1),

	SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5645_DAC1_DIG_VOL,

	SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5645_DAC1_DIG_VOL,

		RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 175, 0, dac_vol_tlv),

		RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 87, 0, dac_vol_tlv),

	SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5645_DAC2_DIG_VOL,

	SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5645_DAC2_DIG_VOL,

		RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 175, 0, dac_vol_tlv),

		RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 87, 0, dac_vol_tlv),





	/* IN1/IN2 Control */

	/* IN1/IN2 Control */

	SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1,

	SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1,
@@ -477,11 +477,11 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { 
	SOC_DOUBLE("ADC Capture Switch", RT5645_STO1_ADC_DIG_VOL,

	SOC_DOUBLE("ADC Capture Switch", RT5645_STO1_ADC_DIG_VOL,

		RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),

		RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),

	SOC_DOUBLE_TLV("ADC Capture Volume", RT5645_STO1_ADC_DIG_VOL,

	SOC_DOUBLE_TLV("ADC Capture Volume", RT5645_STO1_ADC_DIG_VOL,

		RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 127, 0, adc_vol_tlv),

		RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 63, 0, adc_vol_tlv),

	SOC_DOUBLE("Mono ADC Capture Switch", RT5645_MONO_ADC_DIG_VOL,

	SOC_DOUBLE("Mono ADC Capture Switch", RT5645_MONO_ADC_DIG_VOL,

		RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),

		RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),

	SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5645_MONO_ADC_DIG_VOL,

	SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5645_MONO_ADC_DIG_VOL,

		RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 127, 0, adc_vol_tlv),

		RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 63, 0, adc_vol_tlv),





	/* ADC Boost Volume Control */

	/* ADC Boost Volume Control */

	SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5645_ADC_BST_VOL1,

	SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5645_ADC_BST_VOL1,