From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbbCLEdz (ORCPT ); Thu, 12 Mar 2015 00:33:55 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:35873 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750767AbbCLEdw (ORCPT ); Thu, 12 Mar 2015 00:33:52 -0400 X-AuditID: cbfee690-f79ab6d0000046f7-6b-5501172ee444 Message-id: <5501172D.2080804@samsung.com> Date: Thu, 12 Mar 2015 13:33:49 +0900 From: Chanwoo Choi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-version: 1.0 To: Inha Song Cc: broonie@kernel.org, alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, ckeepax@opensource.wolfsonmicro.com, nikesh@opensource.wolfsonmicro.com, lars@metafoo.de, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.de, Li.Xiubo@freescale.com, sachin.kamat@samsung.com Subject: Re: [alsa-devel] [PATCH] ASoC: wm8994: Manage wm8994's MCLK in codec driver References: <1426128580-18320-1-git-send-email-ideal.song@samsung.com> In-reply-to: <1426128580-18320-1-git-send-email-ideal.song@samsung.com> Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFIsWRmVeSWpSXmKPExsWyRsSkWFdPnDHUYPMedosrFw8xWUx9+ITN 4t+UG+wWu/7eZ7RYMnk+q8W3Kx1MFp0XOlgtLu+aw2bx57ymxfK3/9ksOnf1s1pcuXSKzeLl 5jdMDrweGz43sXn8O9zP5LFz1l12j02rOtk8lrw5xOrxcuJvNo99b5exefRtWcXosfl0tcfn TXIBXFFcNimpOZllqUX6dglcGQvPnmMr2C9bsfvgPKYGxgviXYycHBICJhI/9zUxQthiEhfu rWfrYuTiEBJYyihx7Pw9Rpiic1N+M0EkpjNKvP/VwQLhvGaU6Nm0lR2kildAS+L2zF4WEJtF QFVi29ZGsG42oPj+FzfYQGxRgTCJldOvsEDUC0r8mHwPzBYRUJOYcacXbAOzwD4miaMvHzOD JISBGqa+/AE2SEjATWLi+lNgDZwC7hLrjm0Eq2EW0JHY3zqNDcKWl9i85i0zyCAJgZkcEv87 pzBBXCQg8W3yIaBmDqCErMSmA8wQr0lKHFxxg2UCo9gsJDfNQjJ2FpKxCxiZVzGKphYkFxQn pReZ6BUn5haX5qXrJefnbmIERvnpf88m7GC8d8D6EKMAB6MSD2/FV4ZQIdbEsuLK3EOMpkBX TGSWEk3OB6aSvJJ4Q2MzIwtTE1NjI3NLMyVx3tdSP4OFBNITS1KzU1MLUovii0pzUosPMTJx cEo1MLLXGKycW17wcndb0tO7ZkwdEaXJNbVHlbXTDKzvzRDqsElbyNZrbKH5v5nf3K2z+1PO EV/fA6s+7dzH8bet8eHP5KBNhU+q9Ode+/ZK51usyRb7RZaOb8ze6M7awcUeWuzZI/UgdOHF l48Li6qKfA765a9LOTkp4ktxkYq8xRyrgjUazFcclViKMxINtZiLihMBSYuBAu0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCKsWRmVeSWpSXmKPExsVy+t9jQV1dccZQg1v7rCyuXDzEZDH14RM2 i39TbrBb7Pp7n9FiyeT5rBbfrnQwWXRe6GC1uLxrDpvFn/OaFsvf/mez6NzVz2px5dIpNouX m98wOfB6bPjcxObx73A/k8fOWXfZPTat6mTzWPLmEKvHy4m/2Tz2vV3G5tG3ZRWjx+bT1R6f N8kFcEU1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXm AB2vpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcxYePYcW8F+2YrdB+cx NTBeEO9i5OSQEDCRODflNxOELSZx4d56ti5GLg4hgemMEu9/dbBAOK8ZJXo2bWUHqeIV0JK4 PbOXBcRmEVCV2La1kRHEZgOK739xgw3EFhUIk1g5/QoLRL2gxI/J98BsEQE1iRl3eplAhjIL 7GOSOPryMTNIQhioYerLH2CDhATcJCauPwXWwCngLrHu2EawGmYBHYn9rdPYIGx5ic1r3jJP YBSYhWTHLCRls5CULWBkXsUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRnEKeSe9gXNVgcYhR gINRiYf3wneGUCHWxLLiytxDjBIczEoivH6/gEK8KYmVValF+fFFpTmpxYcYTYFBMJFZSjQ5 H5je8kriDY1NzIwsjcwNLYyMzZXEeZXs20KEBNITS1KzU1MLUotg+pg4OKUaGAWNkj7m1R5N 5I1jcf4kv+a/yyOt7PCHdqYrV/QnN12RvCioefH4A+Y1Z3YdFfgi/YVF+ibnzBhe0VmB69hu iH5eyH4gQmyDdqRt0aQXah0MHhw/K3uKPX7frud9sLDa9sytn2tOhooXfag5ZP3/TlGnbNO/ bs4/Yos9fkRWPDsg1zHp25JT55VYijMSDbWYi4oTAZNVaZw3AwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Inha, On 03/12/2015 11:49 AM, 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 | 27 ++++++++++++++++++++++++++- > sound/soc/codecs/wm8994.h | 1 + > 2 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c > index 247b390..d80dcc6 100644 > --- a/sound/soc/codecs/wm8994.c > +++ b/sound/soc/codecs/wm8994.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -2470,6 +2471,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); > > @@ -2491,8 +2493,19 @@ 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++) { > + if (!IS_ERR(wm8994->clk_mclk[i])) > + clk_prepare_enable(wm8994->clk_mclk[i]); I think that you don't need to check error by using 'if' statement. clk_prepare_enable() function will check the NULL state of clk instance before preparing and enabling the clock. for (i = 0; i < ARRAY_SIZE(wm8994->clk_mclk); i++) clk_prepare_enable(wm8994->clk_mclk[i]); But, wm8994_probe() have to initialize the NULL for wm8994->clk_mclk[i]. I added the comment about this on below. > + } > active_reference(codec); > + } else if (codec->dapm.bias_level == SND_SOC_BIAS_ON) { > + for (i = 0; i < ARRAY_SIZE(wm8994->clk_mclk); i++) { > + if (!IS_ERR(wm8994->clk_mclk[i])) > + clk_disable_unprepare( > + wm8994->clk_mclk[i]); > + } > + } > break; > > case SND_SOC_BIAS_STANDBY: > @@ -4451,6 +4464,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 +4474,17 @@ 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])) > + if (PTR_ERR(wm8994->clk_mclk) == -EPROBE_DEFER) > + return -EPROBE_DEFER; I think you better to modify exception handling as following: if (IS_ERR(wm8994->clk_mclk[i])) { wm8994->clk_mclk[i] = NULL; return PTR_ERR(wm8994->clk_mclk); } > + } > + > pm_runtime_enable(&pdev->dev); > pm_runtime_idle(&pdev->dev); > > diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h > index 6536f8d..8cf06a4 100644 > --- a/sound/soc/codecs/wm8994.h > +++ b/sound/soc/codecs/wm8994.h > @@ -78,6 +78,7 @@ struct wm8994_priv { > int sysclk[2]; > int sysclk_rate[2]; > int mclk[2]; > + struct clk *clk_mclk[2]; > int aifclk[2]; > int aifdiv[2]; > int channels[2]; > Thanks, Chanwoo Choi