Commit dad0e523 authored Apr 12, 2015 by Mark Brown

Merge tag 'asoc-fix-v4.0-rc7' into asoc-linus

ASoC: Last minute fix for v4.0

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.

# gpg: Signature made Sat 11 Apr 2015 22:14:17 BST using RSA key ID 5D5487D0
# gpg: WARNING: digest algorithm MD5 is deprecated
# gpg: please see https://gnupg.org/faq/weak-digest-algos.html for more information
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"

parents f22e6e84 14f0413c

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,

Admin message