From: zhangfei.gao@marvell.com (Zhangfei Gao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/2] mmc: sdio add regulator vsdio
Date: Thu, 25 Aug 2011 14:26:14 +0800 [thread overview]
Message-ID: <1314253575-2602-2-git-send-email-zhangfei.gao@marvell.com> (raw)
In-Reply-To: <1314253575-2602-1-git-send-email-zhangfei.gao@marvell.com>
sdio client may be required power on/off dynamically.
With regulator vsdio, sdio client power on/off could be executed by mmc_power_up/down
CC: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
---
drivers/mmc/host/sdhci.c | 22 ++++++++++++++++++++++
include/linux/mmc/sdhci.h | 2 ++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0e02cc1..e0ef7d3 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1424,6 +1424,18 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
out:
mmiowb();
spin_unlock_irqrestore(&host->lock, flags);
+
+ if (host->vsdio) {
+ if (ios->power_mode != host->power_mode_old) {
+ if (ios->power_mode == MMC_POWER_OFF)
+ regulator_disable(host->vsdio);
+
+ if (ios->power_mode == MMC_POWER_UP)
+ regulator_enable(host->vsdio);
+ }
+
+ host->power_mode_old = ios->power_mode;
+ }
}
static int check_ro(struct sdhci_host *host)
@@ -2748,6 +2760,13 @@ int sdhci_add_host(struct sdhci_host *host)
regulator_enable(host->vmmc);
}
+ host->vsdio = regulator_get(mmc_dev(mmc), "vsdio");
+ if (IS_ERR(host->vsdio))
+ host->vsdio = NULL;
+ else
+ printk(KERN_INFO "%s: vsdio regulator found\n",
+ mmc_hostname(mmc));
+
sdhci_init(host, 0);
#ifdef CONFIG_MMC_DEBUG
@@ -2839,6 +2858,9 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
regulator_put(host->vmmc);
}
+ if (host->vsdio)
+ regulator_put(host->vsdio);
+
kfree(host->adma_desc);
kfree(host->align_buffer);
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 5666f3a..201207a 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -94,6 +94,8 @@ struct sdhci_host {
const struct sdhci_ops *ops; /* Low level hw interface */
struct regulator *vmmc; /* Power regulator */
+ struct regulator *vsdio; /* sdio Power regulator */
+ unsigned char power_mode_old; /* power supply mode */
/* Internal data */
struct mmc_host *mmc; /* MMC structure */
--
1.7.0.4
next prev parent reply other threads:[~2011-08-25 6:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 6:26 [PATCH v3 0/2] mmc add vsdio to dynamically control sdio power Zhangfei Gao
2011-08-25 6:26 ` Zhangfei Gao [this message]
2011-08-31 14:06 ` [PATCH v3 1/2] mmc: sdio add regulator vsdio Eric Miao
2011-09-01 1:37 ` zhangfei gao
2011-09-16 15:38 ` Daniel Drake
2011-08-25 6:26 ` [PATCH v3 2/2] ARM: mmp2: support sdio with " Zhangfei Gao
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=1314253575-2602-2-git-send-email-zhangfei.gao@marvell.com \
--to=zhangfei.gao@marvell.com \
--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).