From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH/RESEND 05/12] msm: iommu: Convert to clk_prepare/unprepare
Date: Thu, 20 Jun 2013 09:40:51 -0700 [thread overview]
Message-ID: <20130620164051.GC6300@codeaurora.org> (raw)
In-Reply-To: <1371490999-15501-6-git-send-email-sboyd@codeaurora.org>
Sending to correct Joerg address.
On 06/17, Stephen Boyd wrote:
> Add calls to clk_prepare and unprepare so that MSM can migrate to
> the common clock framework. We never unprepare the clocks until
> driver remove because the clocks are enabled and disabled in irq
> context. Finer grained power management is possible in the future
> via runtime power management techniques.
>
> Cc: Joerg Roedel <joerg.roedel@amd.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> drivers/iommu/msm_iommu_dev.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c
> index 8e8fb07..d344f6a 100644
> --- a/drivers/iommu/msm_iommu_dev.c
> +++ b/drivers/iommu/msm_iommu_dev.c
> @@ -160,7 +160,7 @@ static int msm_iommu_probe(struct platform_device *pdev)
> goto fail;
> }
>
> - ret = clk_enable(iommu_pclk);
> + ret = clk_prepare_enable(iommu_pclk);
> if (ret)
> goto fail_enable;
>
> @@ -170,7 +170,7 @@ static int msm_iommu_probe(struct platform_device *pdev)
> if (clk_get_rate(iommu_clk) == 0)
> clk_set_min_rate(iommu_clk, 1);
>
> - ret = clk_enable(iommu_clk);
> + ret = clk_prepare_enable(iommu_clk);
> if (ret) {
> clk_put(iommu_clk);
> goto fail_pclk;
> @@ -261,7 +261,7 @@ fail_clk:
> clk_put(iommu_clk);
> }
> fail_pclk:
> - clk_disable(iommu_pclk);
> + clk_disable_unprepare(iommu_pclk);
> fail_enable:
> clk_put(iommu_pclk);
> fail:
> @@ -275,8 +275,11 @@ static int msm_iommu_remove(struct platform_device *pdev)
>
> drv = platform_get_drvdata(pdev);
> if (drv) {
> - if (drv->clk)
> + if (drv->clk) {
> + clk_unprepare(drv->clk);
> clk_put(drv->clk);
> + }
> + clk_unprepare(drv->pclk);
> clk_put(drv->pclk);
> memset(drv, 0, sizeof(*drv));
> kfree(drv);
> @@ -314,14 +317,14 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev)
> INIT_LIST_HEAD(&ctx_drvdata->attached_elm);
> platform_set_drvdata(pdev, ctx_drvdata);
>
> - ret = clk_enable(drvdata->pclk);
> + ret = clk_prepare_enable(drvdata->pclk);
> if (ret)
> goto fail;
>
> if (drvdata->clk) {
> - ret = clk_enable(drvdata->clk);
> + ret = clk_prepare_enable(drvdata->clk);
> if (ret) {
> - clk_disable(drvdata->pclk);
> + clk_disable_unprepare(drvdata->pclk);
> goto fail;
> }
> }
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-06-20 16:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 17:43 [PATCH/RESEND 00/12] Convert MSM to common clock framework Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 01/12] msm_serial: Convert to clk_prepare/unprepare Stephen Boyd
2013-06-17 17:55 ` Greg Kroah-Hartman
2013-06-17 18:07 ` David Brown
2013-06-17 18:27 ` Greg Kroah-Hartman
2013-06-17 17:43 ` [PATCH/RESEND 02/12] msm_serial: Use devm_clk_get() and properly return errors Stephen Boyd
2013-06-17 17:55 ` Greg Kroah-Hartman
2013-06-17 17:43 ` [PATCH/RESEND 03/12] usb: otg: msm: Convert to clk_prepare/unprepare Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 04/12] msm_sdcc: " Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 05/12] msm: iommu: " Stephen Boyd
2013-06-20 16:40 ` Stephen Boyd [this message]
2013-06-20 17:04 ` Joerg Roedel
2013-06-17 17:43 ` [PATCH/RESEND 06/12] msm: iommu: Use clk_set_rate() instead of clk_set_min_rate() Stephen Boyd
2013-06-20 16:41 ` Stephen Boyd
2013-06-20 17:04 ` Joerg Roedel
2013-06-17 17:43 ` [PATCH/RESEND 07/12] ARM: msm: Remove custom clk_set_flags() API Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 08/12] ARM: msm: Remove custom clk_set_{max, min}_rate() API Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 09/12] ARM: msm: Remove clock-7x30.h include file Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 10/12] ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 11/12] ARM: msm: Make proc_comm clock control into a platform driver Stephen Boyd
2013-06-19 16:34 ` Stephen Boyd
2013-06-17 17:43 ` [PATCH/RESEND 12/12] ARM: msm: Migrate to common clock framework Stephen Boyd
2013-06-21 1:29 ` [PATCH/RESEND 00/12] Convert MSM " Stephen Boyd
2013-06-24 20:10 ` David 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=20130620164051.GC6300@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).