From: Bo Shen <voice.shen@atmel.com>
To: Mark Brown <broonie@kernel.org>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Liam Girdwood <lrg@slimlogic.co.uk>,
"Richard Purdie" <richard@openedhand.com>,
<patches@opensource.wolfsonmicro.com>
Cc: <linux-sound@vger.kernel.org>, <alsa-devel@alsa-project.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ASoC: wm8731: let codec to manage clock by itself
Date: Thu, 12 Feb 2015 16:23:06 +0800 [thread overview]
Message-ID: <54DC62EA.5030503@atmel.com> (raw)
In-Reply-To: <1423121713-19434-1-git-send-email-voice.shen@atmel.com>
Hi All,
On 02/05/2015 03:35 PM, Bo Shen wrote:
> Let the wm8731 codec to manage clock by itself.
>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
>
> sound/soc/codecs/wm8731.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
Any comments for this patch (aka ping?)
> diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
> index b115ed8..ecd8424 100644
> --- a/sound/soc/codecs/wm8731.c
> +++ b/sound/soc/codecs/wm8731.c
> @@ -13,6 +13,7 @@
> * published by the Free Software Foundation.
> */
>
> +#include <linux/clk.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/init.h>
> @@ -45,6 +46,7 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
> /* codec private data */
> struct wm8731_priv {
> struct regmap *regmap;
> + struct clk *mclk;
> struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
> const struct snd_pcm_hw_constraint_list *constraints;
> unsigned int sysclk;
> @@ -389,6 +391,9 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
> switch (clk_id) {
> case WM8731_SYSCLK_XTAL:
> case WM8731_SYSCLK_MCLK:
> + if (IS_ENABLED(CONFIG_COMMON_CLK))
> + if (clk_set_rate(wm8731->mclk, freq))
> + return -EINVAL;
> wm8731->sysclk_type = clk_id;
> break;
> default:
> @@ -490,6 +495,9 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
>
> switch (level) {
> case SND_SOC_BIAS_ON:
> + if (IS_ENABLED(CONFIG_COMMON_CLK))
> + if (clk_prepare_enable(wm8731->mclk))
> + return -EINVAL;
> break;
> case SND_SOC_BIAS_PREPARE:
> break;
> @@ -508,6 +516,8 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
> snd_soc_write(codec, WM8731_PWR, reg | 0x0040);
> break;
> case SND_SOC_BIAS_OFF:
> + if (IS_ENABLED(CONFIG_COMMON_CLK))
> + clk_disable_unprepare(wm8731->mclk);
> snd_soc_write(codec, WM8731_PWR, 0xffff);
> regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
> wm8731->supplies);
> @@ -666,6 +676,15 @@ static int wm8731_spi_probe(struct spi_device *spi)
> if (wm8731 == NULL)
> return -ENOMEM;
>
> + if (IS_ENABLED(CONFIG_COMMON_CLK)) {
> + wm8731->mclk = devm_clk_get(&spi->dev, "mclk");
> + if (IS_ERR(wm8731->mclk)) {
> + ret = PTR_ERR(wm8731->mclk);
> + dev_err(&spi->dev, "Failed to get MCLK\n");
> + return ret;
> + }
> + }
> +
> mutex_init(&wm8731->lock);
>
> wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
> @@ -717,6 +736,15 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
> if (wm8731 == NULL)
> return -ENOMEM;
>
> + if (IS_ENABLED(CONFIG_COMMON_CLK)) {
> + wm8731->mclk = devm_clk_get(&i2c->dev, "mclk");
> + if (IS_ERR(wm8731->mclk)) {
> + ret = PTR_ERR(wm8731->mclk);
> + dev_err(&i2c->dev, "Failed to get MCLK\n");
> + return ret;
> + }
> + }
> +
> mutex_init(&wm8731->lock);
>
> wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
>
Best Regards,
Bo Shen
next prev parent reply other threads:[~2015-02-12 8:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-05 7:35 [PATCH] ASoC: wm8731: let codec to manage clock by itself Bo Shen
2015-02-12 8:23 ` Bo Shen [this message]
2015-02-16 10:31 ` [alsa-devel] " Charles Keepax
2015-02-16 12:58 ` Manuel Lauss
2015-03-02 2:00 ` Bo Shen
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=54DC62EA.5030503@atmel.com \
--to=voice.shen@atmel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=manuel.lauss@googlemail.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=richard@openedhand.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).