From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Daniel Baluta <daniel.baluta@gmail.com>
Cc: timur@tabi.org, Xiubo.Lee@gmail.com, fabio.estevam@nxp.com,
lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
tiwai@suse.com, alsa-devel@alsa-project.org,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
daniel.baluta@nxp.com, mihai.serban@nxp.com,
viorel.suman@nxp.com, shengjiu.wang@nxp.com
Subject: Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
Date: Thu, 23 Mar 2017 21:58:15 -0700 [thread overview]
Message-ID: <20170324045814.GA15344@Asurada-CZ80> (raw)
In-Reply-To: <1490270510-17061-1-git-send-email-daniel.baluta@gmail.com>
On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
> From: Nicolin Chen <b42378@freescale.com>
>
> WM8962 needs its MCLK when powerup in wm8962_resume(). Thus it's better
> to control the MCLK in codec driver. Thus remove the clock enable in
> machine dirver accordingly.
>
> While at it, get rid of imx_wm8962_remove function since it is now
> empty.
>
> Signed-off-by: Nicolin Chen <b42378@freescale.com>
Hmm...it'd probably be better to let yourself be the author and remove
my signed-off here. Just got an email deliver failure since that email
address is apparently not available any more.
Thanks
Nicolin
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
> sound/soc/fsl/imx-wm8962.c | 40 ++++++++--------------------------------
> 1 file changed, 8 insertions(+), 32 deletions(-)
>
> diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
> index 1b60958..3d894d9 100644
> --- a/sound/soc/fsl/imx-wm8962.c
> +++ b/sound/soc/fsl/imx-wm8962.c
> @@ -33,7 +33,6 @@ struct imx_wm8962_data {
> struct snd_soc_card card;
> char codec_dai_name[DAI_NAME_SIZE];
> char platform_name[DAI_NAME_SIZE];
> - struct clk *codec_clk;
> unsigned int clk_frequency;
> };
>
> @@ -163,6 +162,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
> struct imx_priv *priv = &card_priv;
> struct i2c_client *codec_dev;
> struct imx_wm8962_data *data;
> + struct clk *codec_clk;
> int int_port, ext_port;
> int ret;
>
> @@ -231,19 +231,14 @@ static int imx_wm8962_probe(struct platform_device *pdev)
> goto fail;
> }
>
> - data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
> - if (IS_ERR(data->codec_clk)) {
> - ret = PTR_ERR(data->codec_clk);
> + codec_clk = devm_clk_get(&codec_dev->dev, NULL);
> + if (IS_ERR(codec_clk)) {
> + ret = PTR_ERR(codec_clk);
> dev_err(&codec_dev->dev, "failed to get codec clk: %d\n", ret);
> goto fail;
> }
>
> - data->clk_frequency = clk_get_rate(data->codec_clk);
> - ret = clk_prepare_enable(data->codec_clk);
> - if (ret) {
> - dev_err(&codec_dev->dev, "failed to enable codec clk: %d\n", ret);
> - goto fail;
> - }
> + data->clk_frequency = clk_get_rate(codec_clk);
>
> data->dai.name = "HiFi";
> data->dai.stream_name = "HiFi";
> @@ -258,10 +253,10 @@ static int imx_wm8962_probe(struct platform_device *pdev)
> data->card.dev = &pdev->dev;
> ret = snd_soc_of_parse_card_name(&data->card, "model");
> if (ret)
> - goto clk_fail;
> + goto fail;
> ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
> if (ret)
> - goto clk_fail;
> + goto fail;
> data->card.num_links = 1;
> data->card.owner = THIS_MODULE;
> data->card.dai_link = &data->dai;
> @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
> ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
> if (ret) {
> dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
> - goto clk_fail;
> + goto fail;
> }
>
> - of_node_put(ssi_np);
> - of_node_put(codec_np);
> -
> - return 0;
> -
> -clk_fail:
> - clk_disable_unprepare(data->codec_clk);
> fail:
> of_node_put(ssi_np);
> of_node_put(codec_np);
> @@ -294,17 +282,6 @@ static int imx_wm8962_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int imx_wm8962_remove(struct platform_device *pdev)
> -{
> - struct snd_soc_card *card = platform_get_drvdata(pdev);
> - struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card);
> -
> - if (!IS_ERR(data->codec_clk))
> - clk_disable_unprepare(data->codec_clk);
> -
> - return 0;
> -}
> -
> static const struct of_device_id imx_wm8962_dt_ids[] = {
> { .compatible = "fsl,imx-audio-wm8962", },
> { /* sentinel */ }
> @@ -318,7 +295,6 @@ static struct platform_driver imx_wm8962_driver = {
> .of_match_table = imx_wm8962_dt_ids,
> },
> .probe = imx_wm8962_probe,
> - .remove = imx_wm8962_remove,
> };
> module_platform_driver(imx_wm8962_driver);
>
> --
> 2.7.4
>
next prev parent reply other threads:[~2017-03-24 4:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 12:01 [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK Daniel Baluta
2017-03-24 4:49 ` Nicolin Chen
2017-03-24 4:58 ` Nicolin Chen [this message]
2017-03-24 7:37 ` Daniel Baluta
2017-03-24 7:54 ` Nicolin Chen
2017-03-29 11:54 ` Applied "ASoC: imx-wm8962: Let codec driver enable/disable its MCLK" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170324045814.GA15344@Asurada-CZ80 \
--to=nicoleotsuka@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel.baluta@gmail.com \
--cc=daniel.baluta@nxp.com \
--cc=fabio.estevam@nxp.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mihai.serban@nxp.com \
--cc=perex@perex.cz \
--cc=shengjiu.wang@nxp.com \
--cc=timur@tabi.org \
--cc=tiwai@suse.com \
--cc=viorel.suman@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).