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

Commit ed750192 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus

parents 56f1275b 7d8acf2c

sound/soc/codecs/cs42l52.c

+4 −2
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ static DECLARE_TLV_DB_SCALE(mic_tlv, 1600, 100, 0); 


static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);



static DECLARE_TLV_DB_SCALE(mix_tlv, -50, 50, 0);



static const unsigned int limiter_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

	0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0),
@@ -260,7 +262,7 @@ static const char * const hp_gain_num_text[] = { 
};



static const struct soc_enum hp_gain_enum =

	SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 4,

	SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 5,

		ARRAY_SIZE(hp_gain_num_text), hp_gain_num_text);



static const char * const beep_pitch_text[] = {
@@ -441,7 +443,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { 


	SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume",

			    CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL,

				0, 0x7f, 0x19, hl_tlv),

				0, 0x7f, 0x19, mix_tlv),

	SOC_DOUBLE_R("PCM Mixer Switch",

		     CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1),