From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] msm_sdcc: Convert to clk_prepare/unprepare
Date: Thu, 20 Sep 2012 19:26:50 -0700 [thread overview]
Message-ID: <1348194419-11486-3-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1348194419-11486-1-git-send-email-sboyd@codeaurora.org>
Add calls to clk_prepare and unprepare so that MSM can migrate to
the common clock framework.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/mmc/host/msm_sdcc.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 1d14cda..10cc05b 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1269,10 +1269,18 @@ msmsdcc_probe(struct platform_device *pdev)
goto clk_put;
}
+ ret = clk_prepare(host->pclk);
+ if (ret)
+ goto clk_put;
+
+ ret = clk_prepare(host->clk);
+ if (ret)
+ goto clk_unprepare_p;
+
/* Enable clocks */
ret = msmsdcc_enable_clocks(host);
if (ret)
- goto clk_put;
+ goto clk_unprepare;
host->pclk_rate = clk_get_rate(host->pclk);
host->clk_rate = clk_get_rate(host->clk);
@@ -1387,6 +1395,10 @@ msmsdcc_probe(struct platform_device *pdev)
free_irq(host->stat_irq, host);
clk_disable:
msmsdcc_disable_clocks(host, 0);
+ clk_unprepare:
+ clk_unprepare(host->clk);
+ clk_unprepare_p:
+ clk_unprepare(host->pclk);
clk_put:
clk_put(host->clk);
pclk_put:
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2012-09-21 2:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 2:26 [PATCH 00/10] Convert MSM to common clock framework Stephen Boyd
2012-09-21 2:26 ` [PATCH 01/10] usb: otg: msm: Convert to clk_prepare/unprepare Stephen Boyd
2012-09-26 16:58 ` Pankaj Jangra
2012-09-26 18:48 ` Stephen Boyd
2012-09-26 18:52 ` Pankaj Jangra
2012-09-21 2:26 ` Stephen Boyd [this message]
2012-09-21 2:26 ` [PATCH 03/10] msm: iommu: " Stephen Boyd
2012-09-24 22:32 ` Saravana Kannan
2012-09-25 20:16 ` Stephen Boyd
2012-09-21 2:26 ` [PATCH 04/10] msm: iommu: Use clk_set_rate() instead of clk_set_min_rate() Stephen Boyd
2012-09-21 2:26 ` [PATCH 05/10] ARM: msm: Remove custom clk_set_flags() API Stephen Boyd
2012-09-24 22:33 ` Saravana Kannan
2012-09-21 2:26 ` [PATCH 06/10] ARM: msm: Remove custom clk_set_{max,min}_rate() API Stephen Boyd
2012-09-24 22:37 ` Saravana Kannan
2012-09-21 2:26 ` [PATCH 07/10] ARM: msm: Remove clock-7x30.h include file Stephen Boyd
2012-09-26 17:51 ` Pankaj Jangra
2012-09-26 18:18 ` Stephen Boyd
2012-09-26 18:54 ` Pankaj Jangra
2012-09-21 2:26 ` [PATCH 08/10] ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver Stephen Boyd
2012-09-26 17:35 ` Pankaj Jangra
2012-09-26 18:14 ` Stephen Boyd
2012-09-21 2:26 ` [PATCH 09/10] ARM: msm: Make proc_comm clock control into a platform driver Stephen Boyd
2012-09-26 18:03 ` Pankaj Jangra
2012-09-26 18:36 ` Stephen Boyd
2012-09-21 2:26 ` [PATCH 10/10] ARM: msm: Migrate to common clock framework Stephen Boyd
2012-09-26 18:47 ` Pankaj Jangra
2012-09-26 18:50 ` Stephen Boyd
2012-09-26 18:57 ` Pankaj Jangra
2012-09-22 1:10 ` [PATCH 00/10] Convert MSM " Mike Turquette
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=1348194419-11486-3-git-send-email-sboyd@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).