diff options
author | Howard Mitchell <hm@hmbedded.co.uk> | 2015-03-23 17:17:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-11 17:09:14 -0400 |
commit | 14f0413ce3c400a74213a861bc8f47dca5e4d231 (patch) | |
tree | 61e0510c78f0594d282ae1d9a0b44b0f224ce18f | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
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: Howard Mitchell <hm@hmbedded.co.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/pcm512x.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 9974f201a08f..474cae82a874 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c | |||
@@ -1156,25 +1156,6 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream, | |||
1156 | ret, pcm512x->pll_out); | 1156 | ret, pcm512x->pll_out); |
1157 | return ret; | 1157 | return ret; |
1158 | } | 1158 | } |
1159 | |||
1160 | gpio = PCM512x_G1OE << (4 - 1); | ||
1161 | ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_EN, | ||
1162 | gpio, gpio); | ||
1163 | if (ret != 0) { | ||
1164 | dev_err(codec->dev, "Failed to enable gpio %d: %d\n", | ||
1165 | 4, ret); | ||
1166 | return ret; | ||
1167 | } | ||
1168 | |||
1169 | gpio = PCM512x_GPIO_OUTPUT_1 + 4 - 1; | ||
1170 | ret = regmap_update_bits(pcm512x->regmap, gpio, | ||
1171 | PCM512x_GxSL, PCM512x_GxSL_PLLLK); | ||
1172 | if (ret != 0) { | ||
1173 | dev_err(codec->dev, | ||
1174 | "Failed to output pll lock on %d: %d\n", | ||
1175 | ret, 4); | ||
1176 | return ret; | ||
1177 | } | ||
1178 | } | 1159 | } |
1179 | 1160 | ||
1180 | ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE, | 1161 | ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE, |