Commit 56fd85b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asoc-fix-v4.0-rc7' of git://

Pull last-minute ASoC fix from Mark Brown:
 "This patch backs out a change that came in during the merge window
  which selects a configuration for GPIO4 on pcm512x CODECs that may not
  be suitable for all systems using the device.  Changes for v4.1 will
  make this properly configurable but for now it's safest to revert to
  the v3.19 behaviour and leave the pin configuration alone.

  Sorry for sending this direct at the last minute but due to the GPIO
  misuse it'd be really good to get it in the release and I'd not
  realised it hadn't been sent yet - between some travel, a job change
  and other non-urgent fixes coming in I'd lost track of the urgency.

  It's been in -next for several weeks now, is isolated to the driver
  and fairly clear to inspection"

* tag 'asoc-fix-v4.0-rc7' of git://
  ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4
parents 12522eea 14f0413c
......@@ -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) {
"Failed to output pll lock on %d: %d\n",
ret, 4);
return ret;
ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment