From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265AbbCWVVF (ORCPT ); Mon, 23 Mar 2015 17:21:05 -0400 Received: from avasout02.plus.net ([212.159.14.17]:36947 "EHLO avasout02.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557AbbCWVVD (ORCPT ); Mon, 23 Mar 2015 17:21:03 -0400 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=IsmQcdPg c=1 sm=1 tr=0 a=VGUxJGZ/H8UixBFj6Q9CRg==:117 a=VGUxJGZ/H8UixBFj6Q9CRg==:17 a=0Bzu9jTXAAAA:8 a=eIRpCU4CAAAA:8 a=IOZjIHaP6xqRf771DvgA:9 X-AUTH: oscars+hm@:2500 From: Howard Mitchell To: broonie@kernel.org, peda@axentia.se Cc: tiwai@suse.de, lgirdwood@gmail.com, perex@perex.cz, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Howard Mitchell Subject: [PATCH] ASoC: pcm512x: Remove hardcoding of pll-lock to GPIO4 Date: Mon, 23 Mar 2015 21:17:01 +0000 Message-Id: <1427145421-5544-1-git-send-email-hm@hmbedded.co.uk> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- sound/soc/codecs/pcm512x.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 8472099..5a30fdd 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -1296,25 +1296,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, -- 1.7.9.5