From: Baoyou Xie <baoyou.xie@linaro.org>
To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org,
mark.rutland@arm.com, jun.nie@linaro.org, baoyou.xie@linaro.org,
mturquette@baylibre.com, sboyd@codeaurora.org, perex@perex.cz,
tiwai@suse.com, shawn.guo@linaro.org, vinod.koul@intel.com
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
shawnguo@kernel.org, mathieu.poirier@linaro.org,
xie.baoyou@zte.com.cn, chen.chaokai@zte.com.cn,
wang.qiang01@zte.com.cn
Subject: [PATCH v4 3/3] ASoC: zx-i2s: introduce pclk for zx2967 family
Date: Thu, 9 Feb 2017 11:12:58 +0800 [thread overview]
Message-ID: <1486609978-18482-3-git-send-email-baoyou.xie@linaro.org> (raw)
In-Reply-To: <1486609978-18482-1-git-send-email-baoyou.xie@linaro.org>
The pclk is necessary for zx2967 I2S controller. the driver
currently doesn't handle it. This is something we need to fix.
In turn, the driver supports zx296718's I2S controller.
By the way, this patch also change the clock name from tx to wclk
to make it clear.
Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
sound/soc/zte/zx-i2s.c | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/sound/soc/zte/zx-i2s.c b/sound/soc/zte/zx-i2s.c
index ed7a56d..a865f37 100644
--- a/sound/soc/zte/zx-i2s.c
+++ b/sound/soc/zte/zx-i2s.c
@@ -95,7 +95,8 @@
struct zx_i2s_info {
struct snd_dmaengine_dai_dma_data dma_playback;
struct snd_dmaengine_dai_dma_data dma_capture;
- struct clk *dai_clk;
+ struct clk *dai_wclk;
+ struct clk *dai_pclk;
void __iomem *reg_base;
int master;
resource_size_t mapbase;
@@ -275,8 +276,9 @@ static int zx_i2s_hw_params(struct snd_pcm_substream *substream,
writel_relaxed(val, i2s->reg_base + ZX_I2S_TIMING_CTRL);
if (i2s->master)
- ret = clk_set_rate(i2s->dai_clk,
- params_rate(params) * ch_num * CLK_RAT);
+ ret = clk_set_rate(i2s->dai_wclk,
+ params_rate(params) * ch_num * CLK_RAT);
+
return ret;
}
@@ -328,8 +330,19 @@ static int zx_i2s_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct zx_i2s_info *zx_i2s = dev_get_drvdata(dai->dev);
+ int ret;
+
+ ret = clk_prepare_enable(zx_i2s->dai_wclk);
+ if (ret)
+ return ret;
+
+ ret = clk_prepare_enable(zx_i2s->dai_pclk);
+ if (ret) {
+ clk_disable_unprepare(zx_i2s->dai_wclk);
+ return ret;
+ }
- return clk_prepare_enable(zx_i2s->dai_clk);
+ return ret;
}
static void zx_i2s_shutdown(struct snd_pcm_substream *substream,
@@ -337,7 +350,8 @@ static void zx_i2s_shutdown(struct snd_pcm_substream *substream,
{
struct zx_i2s_info *zx_i2s = dev_get_drvdata(dai->dev);
- clk_disable_unprepare(zx_i2s->dai_clk);
+ clk_disable_unprepare(zx_i2s->dai_wclk);
+ clk_disable_unprepare(zx_i2s->dai_pclk);
}
static struct snd_soc_dai_ops zx_i2s_dai_ops = {
@@ -381,10 +395,16 @@ static int zx_i2s_probe(struct platform_device *pdev)
if (!zx_i2s)
return -ENOMEM;
- zx_i2s->dai_clk = devm_clk_get(&pdev->dev, "tx");
- if (IS_ERR(zx_i2s->dai_clk)) {
- dev_err(&pdev->dev, "Fail to get clk\n");
- return PTR_ERR(zx_i2s->dai_clk);
+ zx_i2s->dai_wclk = devm_clk_get(&pdev->dev, "wclk");
+ if (IS_ERR(zx_i2s->dai_wclk)) {
+ dev_err(&pdev->dev, "Fail to get wclk\n");
+ return PTR_ERR(zx_i2s->dai_wclk);
+ }
+
+ zx_i2s->dai_pclk = devm_clk_get(&pdev->dev, "pclk");
+ if (IS_ERR(zx_i2s->dai_pclk)) {
+ dev_err(&pdev->dev, "Fail to get pclk\n");
+ return PTR_ERR(zx_i2s->dai_pclk);
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.7.4
next prev parent reply other threads:[~2017-02-09 3:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 3:12 [PATCH v4 1/3] clk: zte: add i2s clocks for zx296718 Baoyou Xie
2017-02-09 3:12 ` [PATCH v4 2/3] ASoC: zx-i2s: Add the info of pclk to the binding document for zx2967 family Baoyou Xie
2017-02-09 16:46 ` Mark Brown
2017-02-13 13:05 ` Shawn Guo
2017-02-09 23:46 ` Applied "ASoC: zx-i2s: Add the info of pclk to the binding document for zx2967 family" to the asoc tree Mark Brown
2017-02-09 3:12 ` Baoyou Xie [this message]
2017-02-09 3:22 ` [PATCH v4 3/3] ASoC: zx-i2s: introduce pclk for zx2967 family Shawn Guo
2017-02-09 8:19 ` Jun Nie
2017-02-09 23:46 ` Applied "ASoC: zx-i2s: introduce pclk for zx2967 family" to the asoc tree Mark Brown
2017-02-09 3:20 ` [PATCH v4 1/3] clk: zte: add i2s clocks for zx296718 Shawn Guo
2017-02-10 17:17 ` Stephen Boyd
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=1486609978-18482-3-git-send-email-baoyou.xie@linaro.org \
--to=baoyou.xie@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=chen.chaokai@zte.com.cn \
--cc=devicetree@vger.kernel.org \
--cc=jun.nie@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mturquette@baylibre.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=shawn.guo@linaro.org \
--cc=shawnguo@kernel.org \
--cc=tiwai@suse.com \
--cc=vinod.koul@intel.com \
--cc=wang.qiang01@zte.com.cn \
--cc=xie.baoyou@zte.com.cn \
/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).