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

Commit 395d33bb authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 0a81cbef 1c6d3680

sound/soc/codecs/pcm512x.c

+2 −2
Original line number Diff line number Diff line
@@ -259,13 +259,13 @@ static const struct soc_enum pcm512x_veds = 
			pcm512x_ramp_step_text);



static const struct snd_kcontrol_new pcm512x_controls[] = {

SOC_DOUBLE_R_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2,

SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2,

		 PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),

SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,

	       PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),

SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,

	       PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),

SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,

SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,

	   PCM512x_RQMR_SHIFT, 1, 1),



SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),