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

Commit cd02e3df authored by Howard Mitchell's avatar Howard Mitchell Committed by Mark Brown
Browse files

ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 



Currently GPIO4 is hardcoded to output the pll-lock signal.
Unfortunately this is after the pll-out GPIO is configured which
is selectable in the device tree. Therefore it is not possible to
use GPIO4 for pll-out. Therefore this patch removes the
configuration of GPIO4.

Signed-off-by: default avatarHoward Mitchell <hm@hmbedded.co.uk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f073faa7

sound/soc/codecs/pcm512x.c

+0 −19
Original line number Diff line number Diff line
@@ -1156,25 +1156,6 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream, 
				ret, pcm512x->pll_out);

			return ret;

		}



		gpio = PCM512x_G1OE << (4 - 1);

		ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_EN,

					 gpio, gpio);

		if (ret != 0) {

			dev_err(codec->dev, "Failed to enable gpio %d: %d\n",

				4, ret);

			return ret;

		}



		gpio = PCM512x_GPIO_OUTPUT_1 + 4 - 1;

		ret = regmap_update_bits(pcm512x->regmap, gpio,

					 PCM512x_GxSL, PCM512x_GxSL_PLLLK);

		if (ret != 0) {

			dev_err(codec->dev,

				"Failed to output pll lock on %d: %d\n",

				ret, 4);

			return ret;

		}

	}



	ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE,