* [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
@ 2017-03-23 12:01 Daniel Baluta
2017-03-24 4:49 ` Nicolin Chen
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Baluta @ 2017-03-23 12:01 UTC (permalink / raw)
To: timur, nicoleotsuka, Xiubo.Lee, fabio.estevam, lgirdwood,
broonie, perex, tiwai
Cc: alsa-devel, linuxppc-dev, linux-kernel, daniel.baluta,
mihai.serban, viorel.suman, shengjiu.wang, Nicolin Chen
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>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
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
2017-03-29 11:54 ` Applied "ASoC: imx-wm8962: Let codec driver enable/disable its MCLK" to the asoc tree Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2017-03-24 4:49 UTC (permalink / raw)
To: Daniel Baluta
Cc: timur, Xiubo.Lee, fabio.estevam, lgirdwood, broonie, perex,
tiwai, alsa-devel, linuxppc-dev, linux-kernel, daniel.baluta,
mihai.serban, viorel.suman, shengjiu.wang, Nicolin Chen
Hi,
Could you please revise the subject a bit? I forgot what's the
original one I submitted (internally) years ago. But the patch
is for imx-wm8962 instead of WM8962.
So please use
ASoC: fsl: imx-wm8962:
or at least
ASoC: imx-wm8962:
The change itself looks fine though.
Thanks
Nic
----
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>
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
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
2017-03-24 7:37 ` Daniel Baluta
2017-03-29 11:54 ` Applied "ASoC: imx-wm8962: Let codec driver enable/disable its MCLK" to the asoc tree Mark Brown
2 siblings, 1 reply; 6+ messages in thread
From: Nicolin Chen @ 2017-03-24 4:58 UTC (permalink / raw)
To: Daniel Baluta
Cc: timur, Xiubo.Lee, fabio.estevam, lgirdwood, broonie, perex,
tiwai, alsa-devel, linuxppc-dev, linux-kernel, daniel.baluta,
mihai.serban, viorel.suman, shengjiu.wang
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
2017-03-24 4:58 ` Nicolin Chen
@ 2017-03-24 7:37 ` Daniel Baluta
2017-03-24 7:54 ` Nicolin Chen
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Baluta @ 2017-03-24 7:37 UTC (permalink / raw)
To: Nicolin Chen
Cc: Timur Tabi, Xiubo.Lee, fabio.estevam, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, alsa-devel, linuxppc-dev,
Linux Kernel Mailing List, Daniel Baluta, mihai.serban,
viorel.suman, shengjiu.wang
On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen <nicoleotsuka@gmail.com> wrote:
> 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.
Hi Nic,
I will fix the prefix subject as suggested. Is it OK to use
your current email address for the signed-off-by tag?
Daniel.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK
2017-03-24 7:37 ` Daniel Baluta
@ 2017-03-24 7:54 ` Nicolin Chen
0 siblings, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2017-03-24 7:54 UTC (permalink / raw)
To: Daniel Baluta
Cc: Timur Tabi, Xiubo.Lee, fabio.estevam, Liam Girdwood, Mark Brown,
Jaroslav Kysela, Takashi Iwai, alsa-devel, linuxppc-dev,
Linux Kernel Mailing List, Daniel Baluta, mihai.serban,
viorel.suman, shengjiu.wang
On Fri, Mar 24, 2017 at 09:37:00AM +0200, Daniel Baluta wrote:
> On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen <nicoleotsuka@gmail.com> wrote:
> > 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.
>
> Hi Nic,
>
> I will fix the prefix subject as suggested. Is it OK to use
> your current email address for the signed-off-by tag?
The email address in the "From" would probably still remain that one,
which causes the problem.
I personally prefer that you resend it using your own and I could give
an Ack to it. It isn't really necessary to let me take the credit :)
Thanks
Nicolin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Applied "ASoC: imx-wm8962: Let codec driver enable/disable its MCLK" to the asoc tree
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
@ 2017-03-29 11:54 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2017-03-29 11:54 UTC (permalink / raw)
To: Daniel Baluta
Cc: Mark Brown, timur, nicoleotsuka, Xiubo.Lee, fabio.estevam,
lgirdwood, broonie, perex, tiwai, alsa-devel, linuxppc-dev,
shengjiu.wang, Nicolin Chen, linux-kernel, viorel.suman,
mihai.serban, daniel.baluta, alsa-devel
The patch
ASoC: imx-wm8962: Let codec driver enable/disable its MCLK
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From fd8ba1e3093e2f405df20c7f6c1150187ecdb18b Mon Sep 17 00:00:00 2001
From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Tue, 28 Mar 2017 11:58:51 +0300
Subject: [PATCH] ASoC: imx-wm8962: Let codec driver enable/disable its MCLK
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 driver accordingly.
While at it, get rid of imx_wm8962_remove function since it is now
empty.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 1b60958e2080..3d894d9123e0 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.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-29 11:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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).