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

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

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

parents a55ede16 cd02e3df

Documentation/sound/alsa/ControlNames.txt

+5 −5
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ SOURCE: 
  HDMI/DP	(either HDMI or DisplayPort)



Exceptions (deprecated):

  [Digital] Capture Source

  [Digital] Capture Switch	(aka input gain switch)

  [Digital] Capture Volume	(aka input gain volume)

  [Digital] Playback Switch	(aka output gain switch)

  [Digital] Playback Volume	(aka output gain volume)

  [Analogue|Digital] Capture Source

  [Analogue|Digital] Capture Switch	(aka input gain switch)

  [Analogue|Digital] Capture Volume	(aka input gain volume)

  [Analogue|Digital] Playback Switch	(aka output gain switch)

  [Analogue|Digital] Playback Volume	(aka output gain volume)

  Tone Control - Switch

  Tone Control - Bass

  Tone Control - Treble

sound/soc/codecs/pcm512x.c

+4 −4
Original line number Diff line number Diff line
@@ -304,9 +304,9 @@ static const struct soc_enum pcm512x_veds = 
static const struct snd_kcontrol_new pcm512x_controls[] = {

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,

SOC_DOUBLE_TLV("Analogue 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,

SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,

	       PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),

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

	   PCM512x_RQMR_SHIFT, 1, 1),
@@ -576,8 +576,8 @@ static int pcm512x_find_pll_coeff(struct snd_soc_dai *dai, 


	/* pllin_rate / P (or here, den) cannot be greater than 20 MHz */

	if (pllin_rate / den > 20000000 && num < 8) {

		num *= 20000000 / (pllin_rate / den);

		den *= 20000000 / (pllin_rate / den);

		num *= DIV_ROUND_UP(pllin_rate / den, 20000000);

		den *= DIV_ROUND_UP(pllin_rate / den, 20000000);

	}

	dev_dbg(dev, "num / den = %lu / %lu\n", num, den);