mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Inha Song <ideal.song@samsung.com>
To: broonie@kernel.org, alsa-devel@alsa-project.org
Cc: 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,
	cw00.choi@samsung.com, Inha Song <ideal.song@samsung.com>
Subject: [PATCH] ASoC: wm8994: Manage wm8994's MCLK in codec driver
Date: Thu, 12 Mar 2015 11:49:40 +0900	[thread overview]
Message-ID: <1426128580-18320-2-git-send-email-ideal.song@samsung.com> (raw)
In-Reply-To: <1426128580-18320-1-git-send-email-ideal.song@samsung.com>

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 <ideal.song@samsung.com>
---
 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 <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
+#include <linux/clk.h>
 #include <linux/gcd.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
@@ -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]);
+			}
 			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;
+	}
+
 	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];
-- 
2.0.0.390.gcb682f8


  reply	other threads:[~2015-03-12  2:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-12  2:49 [alsa-devel] " Inha Song
2015-03-12  2:49 ` Inha Song [this message]
2015-03-12  4:33 ` Chanwoo Choi
2015-03-12  5:02   ` Inha Song
2015-03-12 11:39 ` 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=1426128580-18320-2-git-send-email-ideal.song@samsung.com \
    --to=ideal.song@samsung.com \
    --cc=Li.Xiubo@freescale.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=ckeepax@opensource.wolfsonmicro.com \
    --cc=cw00.choi@samsung.com \
    --cc=lars@metafoo.de \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nikesh@opensource.wolfsonmicro.com \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=perex@perex.cz \
    --cc=sachin.kamat@samsung.com \
    --cc=tiwai@suse.de \
    /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

all inboxes | Powered by JetHome®