Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-24 Thread Nicolin Chen 
On Fri, Mar 24, 2017 at 09:37:00AM +0200, Daniel Baluta wrote:
> On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen  wrote:
> > On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
> >> From: Nicolin Chen 
> >>
> >> 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 
> >
> > 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

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-24 Thread Nicolin Chen 
On Fri, Mar 24, 2017 at 09:37:00AM +0200, Daniel Baluta wrote:
> On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen  wrote:
> > On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
> >> From: Nicolin Chen 
> >>
> >> 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 
> >
> > 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

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-24 Thread Daniel Baluta 
On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen  wrote:
> On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
>> From: Nicolin Chen 
>>
>> 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 
>
> 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.

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-24 Thread Daniel Baluta 
On Fri, Mar 24, 2017 at 6:58 AM, Nicolin Chen  wrote:
> On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
>> From: Nicolin Chen 
>>
>> 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 
>
> 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.

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread Nicolin Chen 
On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
> From: Nicolin Chen 
> 
> 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 

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 
> ---
>  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 = _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(_dev->dev, NULL);
> - if (IS_ERR(data->codec_clk)) {
> - ret = PTR_ERR(data->codec_clk);
> + codec_clk = devm_clk_get(_dev->dev, NULL);
> + if (IS_ERR(codec_clk)) {
> + ret = PTR_ERR(codec_clk);
>   dev_err(_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(_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 = >dev;
>   ret = snd_soc_of_parse_card_name(>card, "model");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   data->card.num_links = 1;
>   data->card.owner = THIS_MODULE;
>   data->card.dai_link = >dai;
> @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
>   ret = devm_snd_soc_register_card(>dev, >card);
>   if (ret) {
>   dev_err(>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
>

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread Nicolin Chen 
On Thu, Mar 23, 2017 at 02:01:50PM +0200, Daniel Baluta wrote:
> From: Nicolin Chen 
> 
> 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 

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 
> ---
>  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 = _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(_dev->dev, NULL);
> - if (IS_ERR(data->codec_clk)) {
> - ret = PTR_ERR(data->codec_clk);
> + codec_clk = devm_clk_get(_dev->dev, NULL);
> + if (IS_ERR(codec_clk)) {
> + ret = PTR_ERR(codec_clk);
>   dev_err(_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(_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 = >dev;
>   ret = snd_soc_of_parse_card_name(>card, "model");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   data->card.num_links = 1;
>   data->card.owner = THIS_MODULE;
>   data->card.dai_link = >dai;
> @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
>   ret = devm_snd_soc_register_card(>dev, >card);
>   if (ret) {
>   dev_err(>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
>

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread 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 
> 
> 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 
> Signed-off-by: Daniel Baluta 
> ---
>  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 = _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(_dev->dev, NULL);
> - if (IS_ERR(data->codec_clk)) {
> - ret = PTR_ERR(data->codec_clk);
> + codec_clk = devm_clk_get(_dev->dev, NULL);
> + if (IS_ERR(codec_clk)) {
> + ret = PTR_ERR(codec_clk);
>   dev_err(_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(_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 = >dev;
>   ret = snd_soc_of_parse_card_name(>card, "model");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   data->card.num_links = 1;
>   data->card.owner = THIS_MODULE;
>   data->card.dai_link = >dai;
> @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
>   ret = devm_snd_soc_register_card(>dev, >card);
>   if (ret) {
>   dev_err(>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
>

Re: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread 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 
> 
> 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 
> Signed-off-by: Daniel Baluta 
> ---
>  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 = _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(_dev->dev, NULL);
> - if (IS_ERR(data->codec_clk)) {
> - ret = PTR_ERR(data->codec_clk);
> + codec_clk = devm_clk_get(_dev->dev, NULL);
> + if (IS_ERR(codec_clk)) {
> + ret = PTR_ERR(codec_clk);
>   dev_err(_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(_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 = >dev;
>   ret = snd_soc_of_parse_card_name(>card, "model");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
>   if (ret)
> - goto clk_fail;
> + goto fail;
>   data->card.num_links = 1;
>   data->card.owner = THIS_MODULE;
>   data->card.dai_link = >dai;
> @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
>   ret = devm_snd_soc_register_card(>dev, >card);
>   if (ret) {
>   dev_err(>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
>

[PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread Daniel Baluta 
From: Nicolin Chen 

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 
Signed-off-by: Daniel Baluta 
---
 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 = _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(_dev->dev, NULL);
-   if (IS_ERR(data->codec_clk)) {
-   ret = PTR_ERR(data->codec_clk);
+   codec_clk = devm_clk_get(_dev->dev, NULL);
+   if (IS_ERR(codec_clk)) {
+   ret = PTR_ERR(codec_clk);
dev_err(_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(_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 = >dev;
ret = snd_soc_of_parse_card_name(>card, "model");
if (ret)
-   goto clk_fail;
+   goto fail;
ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
if (ret)
-   goto clk_fail;
+   goto fail;
data->card.num_links = 1;
data->card.owner = THIS_MODULE;
data->card.dai_link = >dai;
@@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
ret = devm_snd_soc_register_card(>dev, >card);
if (ret) {
dev_err(>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

[PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK

2017-03-23 Thread Daniel Baluta 
From: Nicolin Chen 

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 
Signed-off-by: Daniel Baluta 
---
 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 = _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(_dev->dev, NULL);
-   if (IS_ERR(data->codec_clk)) {
-   ret = PTR_ERR(data->codec_clk);
+   codec_clk = devm_clk_get(_dev->dev, NULL);
+   if (IS_ERR(codec_clk)) {
+   ret = PTR_ERR(codec_clk);
dev_err(_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(_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 = >dev;
ret = snd_soc_of_parse_card_name(>card, "model");
if (ret)
-   goto clk_fail;
+   goto fail;
ret = snd_soc_of_parse_audio_routing(>card, "audio-routing");
if (ret)
-   goto clk_fail;
+   goto fail;
data->card.num_links = 1;
data->card.owner = THIS_MODULE;
data->card.dai_link = >dai;
@@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev)
ret = devm_snd_soc_register_card(>dev, >card);
if (ret) {
dev_err(>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