From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757369AbbCPPIU (ORCPT ); Mon, 16 Mar 2015 11:08:20 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:55388 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755749AbbCPPIQ (ORCPT ); Mon, 16 Mar 2015 11:08:16 -0400 Date: Mon, 16 Mar 2015 15:08:14 +0000 From: Charles Keepax To: Inha Song Cc: broonie@kernel.org, alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, nikesh@opensource.wolfsonmicro.com, lars@metafoo.de, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.de, Li.Xiubo@freescale.com, sachin.kamat@samsung.com, cw00.choi@samsung.com Subject: Re: [alsa-devel] [PATCH v2] ASoC: wm8994: Manage wm8994's MCLK in codec driver Message-ID: <20150316150814.GK17136@opensource.wolfsonmicro.com> References: <1426157181-6403-1-git-send-email-ideal.song@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426157181-6403-1-git-send-email-ideal.song@samsung.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 12, 2015 at 07:46:21PM +0900, Inha Song wrote: > Previously, When we use wm8994 codec, we should control its MCLK in machine driver. > But, It should be managed by wm8994 codec driver, not machine driver. > > This patch add MCLK clock DT parsing logic and control own MCLK. > > Signed-off-by: Inha Song > --- > sound/soc/codecs/wm8994.c | 22 +++++++++++++++++++++- > sound/soc/codecs/wm8994.h | 1 + > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c > index 4fbc768..acb6b44 100644 > --- a/sound/soc/codecs/wm8994.c > +++ b/sound/soc/codecs/wm8994.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -2471,6 +2472,7 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec, > { > struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); > struct wm8994 *control = wm8994->wm8994; > + int i; > > wm_hubs_set_bias_level(codec, level); > > @@ -2492,8 +2494,15 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec, > break; > } > > - if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) > + if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) { > + for (i = 0; i < ARRAY_SIZE(wm8994->clk_mclk); i++) > + clk_prepare_enable(wm8994->clk_mclk[i]); This still looks like you need some response to Mark's comments. > + > active_reference(codec); > + } else if (codec->dapm.bias_level == SND_SOC_BIAS_ON) { > + for (i = 0; i < ARRAY_SIZE(wm8994->clk_mclk); i++) > + clk_disable_unprepare(wm8994->clk_mclk[i]); > + } > break; > > case SND_SOC_BIAS_STANDBY: > @@ -4449,6 +4458,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = { > static int wm8994_probe(struct platform_device *pdev) > { > struct wm8994_priv *wm8994; > + int i; > > wm8994 = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_priv), > GFP_KERNEL); > @@ -4460,6 +4470,16 @@ static int wm8994_probe(struct platform_device *pdev) > > wm8994->wm8994 = dev_get_drvdata(pdev->dev.parent); > > + for (i = 0; i < ARRAY_SIZE(wm8994->clk_mclk); i++) { > + char mclk_name[] = "MCLKx"; > + > + snprintf(mclk_name, sizeof(mclk_name), "MCLK%d", i + 1); > + > + wm8994->clk_mclk[i] = devm_clk_get(pdev->dev.parent, mclk_name); > + if (IS_ERR(wm8994->clk_mclk[i])) > + wm8994->clk_mclk[i] = NULL; This still looks wrong, devm_clk_get will return an -ENOENT if it can't find a clock, but any other error is surely an actual error that we should fail on? Thanks, Charles