From: Caesar Wang <wxt@rock-chips.com>
To: Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org
Cc: leozwang@google.com, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, keescook@google.com,
Sonny Rao <sonnyrao@chromium.org>,
Jianqun Xu <jay.xu@rock-chips.com>,
Caesar Wang <wxt@rock-chips.com>
Subject: [PATCH v3 3/9] ASoC: rockchip: i2s: add support for grabbing output clock to codec
Date: Fri, 15 Jan 2016 21:49:50 +0800 [thread overview]
Message-ID: <1452865796-23527-4-git-send-email-wxt@rock-chips.com> (raw)
In-Reply-To: <1452865796-23527-1-git-send-email-wxt@rock-chips.com>
From: Sonny Rao <sonnyrao@chromium.org>
We need to claim the clock which is driving the codec so that when we
enable clock gating, we continue to clock the codec when needed.
I make this an optional clock since there might be some applications
where we don't need it but can still use the I2S block.
Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---
Changes in v3:
- As the perious discuss on https://patchwork.kernel.org/patch/5427131/,
I think Mark likes do it in codec driver, I have to say I agree this
patch in here since that's the i2s block output. I don't know if the
Mark has changed his mind.
- Add the suspend/resume handle the clock.
sound/soc/rockchip/rockchip_i2s.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 58ee645..5889bba 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -28,6 +28,7 @@ struct rk_i2s_dev {
struct clk *hclk;
struct clk *mclk;
+ struct clk *oclk;
struct snd_dmaengine_dai_dma_data capture_dma_data;
struct snd_dmaengine_dai_dma_data playback_dma_data;
@@ -47,6 +48,9 @@ static int i2s_runtime_suspend(struct device *dev)
{
struct rk_i2s_dev *i2s = dev_get_drvdata(dev);
+ if (i2s->oclk)
+ clk_disable_unprepare(i2s->oclk);
+
clk_disable_unprepare(i2s->mclk);
return 0;
@@ -63,6 +67,14 @@ static int i2s_runtime_resume(struct device *dev)
return ret;
}
+ if (i2s->oclk) {
+ ret = clk_prepare_enable(i2s->oclk);
+ if (ret) {
+ dev_err(i2s->dev, "oclk enable failed %d\n", ret);
+ return ret;
+ }
+ }
+
return 0;
}
@@ -480,6 +492,15 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
return PTR_ERR(i2s->mclk);
}
+ i2s->oclk = devm_clk_get(&pdev->dev, "i2s_clk_out");
+ if (IS_ERR(i2s->oclk)) {
+ dev_dbg(&pdev->dev, "Didn't find output clock\n");
+ i2s->oclk = NULL;
+ }
+
+ if (i2s->oclk)
+ ret = clk_prepare_enable(i2s->oclk);
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(regs))
@@ -552,6 +573,9 @@ static int rockchip_i2s_remove(struct platform_device *pdev)
if (!pm_runtime_status_suspended(&pdev->dev))
i2s_runtime_suspend(&pdev->dev);
+ if (i2s->oclk)
+ clk_disable_unprepare(i2s->oclk);
+
clk_disable_unprepare(i2s->mclk);
clk_disable_unprepare(i2s->hclk);
--
1.9.1
next prev parent reply other threads:[~2016-01-15 13:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 13:49 [PATCH v3 0/9] Add the family patches to support for kylin board Caesar Wang
2016-01-15 13:49 ` [PATCH v3 1/9] ARM: dts: rockchip: add hdmi/vop device node for rk3036 Caesar Wang
[not found] ` <1452865796-23527-1-git-send-email-wxt-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-01-15 13:49 ` [PATCH v3 2/9] ARM: dts: rockchip: add i2s_clk_out to list of clocks used on rk3036 i2s Caesar Wang
2016-01-15 13:49 ` [PATCH v3 7/9] ARM: dts: rockchip: add the sdmmc for kylin board Caesar Wang
2016-01-17 19:37 ` Heiko Stuebner
2016-01-15 13:49 ` Caesar Wang [this message]
2016-01-15 17:46 ` [PATCH v3 3/9] ASoC: rockchip: i2s: add support for grabbing output clock to codec Mark Brown
[not found] ` <20160115174623.GZ6588-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-01-15 21:48 ` Sonny Rao
2016-01-22 17:18 ` Mark Brown
[not found] ` <20160122171815.GD6588-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-01-25 1:15 ` Jianqun Xu
2016-01-26 9:52 ` Heiko Stübner
2016-01-27 12:47 ` Mark Brown
2016-01-15 13:49 ` [PATCH v3 4/9] ARM: dts: rockchip: enable the uart0 for kylin board Caesar Wang
2016-01-17 19:23 ` Heiko Stuebner
2016-01-15 13:49 ` [PATCH v3 5/9] ARM: dts: rockchip: enable the high speed on sdio " Caesar Wang
2016-01-17 19:26 ` Heiko Stuebner
2016-01-15 13:49 ` [PATCH v3 6/9] ARM: dts: rockchip: add the sdio power sequence " Caesar Wang
2016-01-17 19:31 ` Heiko Stuebner
2016-01-15 13:49 ` [PATCH v3 8/9] ARM: dts: rockchip: add reboot-mode node for rk3036 SoCs Caesar Wang
[not found] ` <1452865796-23527-9-git-send-email-wxt-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-01-17 19:18 ` Heiko Stuebner
2016-01-18 1:11 ` Andy Yan
2016-01-15 13:49 ` [PATCH v3 9/9] ARM: dts: rockchip: add pl330-broken-no-flushp quirk " Caesar Wang
2016-01-17 19:20 ` Heiko Stuebner
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=1452865796-23527-4-git-send-email-wxt@rock-chips.com \
--to=wxt@rock-chips.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=jay.xu@rock-chips.com \
--cc=keescook@google.com \
--cc=leozwang@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=sonnyrao@chromium.org \
/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