mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Prashant Gaikwad <pgaikwad@nvidia.com>
To: <swarren@nvidia.com>, <linux-tegra@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>
Cc: <linux-kernel@vger.kernel.org>, <olof@lixom.net>,
	Prashant Gaikwad <pgaikwad@nvidia.com>,
	<paul.gortmaker@windriver.com>, <shawn.guo@linaro.org>,
	<linux-mmc@vger.kernel.org>
Subject: [PATCH 3/9] mmc: tegra: add clk_prepare/clk_unprepare
Date: Fri, 1 Jun 2012 14:42:42 +0530	[thread overview]
Message-ID: <1338541968-7961-4-git-send-email-pgaikwad@nvidia.com> (raw)
In-Reply-To: <1338541968-7961-1-git-send-email-pgaikwad@nvidia.com>

Use clk_prepare/clk_unprepare as required by the generic clk framework.

This patch should go through Tegra tree since other patches to port tegra
to generic clock framework are dependent on it. Posting here to get ack from
the maintainers.

Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
---
 drivers/mmc/host/sdhci-tegra.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index b38d8a7..2789656 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -334,7 +334,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
 		rc = PTR_ERR(clk);
 		goto err_clk_get;
 	}
-	clk_enable(clk);
+	clk_prepare_enable(clk);
 	pltfm_host->clk = clk;
 
 	host->mmc->pm_caps = plat->pm_flags;
@@ -349,7 +349,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
 	return 0;
 
 err_add_host:
-	clk_disable(pltfm_host->clk);
+	clk_disable_unprepare(pltfm_host->clk);
 	clk_put(pltfm_host->clk);
 err_clk_get:
 	if (gpio_is_valid(plat->wp_gpio))
@@ -390,7 +390,7 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
 	if (gpio_is_valid(plat->power_gpio))
 		gpio_free(plat->power_gpio);
 
-	clk_disable(pltfm_host->clk);
+	clk_disable_unprepare(pltfm_host->clk);
 	clk_put(pltfm_host->clk);
 
 	sdhci_pltfm_free(pdev);
-- 
1.7.4.1


  parent reply	other threads:[~2012-06-01  9:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-01  9:12 [PATCH 0/9] Add clk_prepare/clk_unprepare Prashant Gaikwad
2012-06-01  9:12 ` [PATCH 1/9] ARM: tegra: add clk_prepare/clk_unprepare Prashant Gaikwad
2012-06-01 12:22   ` Sergei Shtylyov
2012-06-01  9:12 ` [PATCH 2/9] i2c: tegra: Add clk_prepare/clk_unprepare Prashant Gaikwad
2012-06-01  9:12 ` Prashant Gaikwad [this message]
2012-06-01  9:12 ` [PATCH 4/9] USB: ehci-tegra: add clk_prepare/clk_unprepare Prashant Gaikwad
2012-06-01  9:12 ` [PATCH 5/9] Input: tegra-kbc - " Prashant Gaikwad
2012-06-01  9:12 ` [PATCH 6/9] spi/tegra: " Prashant Gaikwad
2012-06-01  9:12 ` [PATCH 7/9] staging: nvec: " Prashant Gaikwad
2012-06-01 17:31   ` Marc Dietrich
2012-06-01  9:12 ` [PATCH 8/9] ASoC: tegra: " Prashant Gaikwad
2012-06-01  9:12 ` [PATCH 9/9] crypto: " Prashant Gaikwad
2012-06-01 14:48 ` [PATCH 0/9] Add clk_prepare/clk_unprepare 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=1338541968-7961-4-git-send-email-pgaikwad@nvidia.com \
    --to=pgaikwad@nvidia.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=paul.gortmaker@windriver.com \
    --cc=shawn.guo@linaro.org \
    --cc=swarren@nvidia.com \
    /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®