From: Antonio Ospite <ospite@studenti.unina.it>
To: linux-mmc@vger.kernel.org
Cc: Antonio Ospite <ospite@studenti.unina.it>,
Chris Ball <cjb@laptop.org>,
Grant Likely <grant.likely@secretlab.ca>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
openezx-devel@lists.openezx.org,
spi-devel-general@lists.sourceforge.net
Subject: [PATCH v2 4/4] mmc_spi.c: add support for the regulator framework
Date: Fri, 22 Apr 2011 14:43:11 +0200 [thread overview]
Message-ID: <1303476191-20663-1-git-send-email-ospite@studenti.unina.it> (raw)
In-Reply-To: <20110421124041.GF11788@opensource.wolfsonmicro.com>
Add support for powering up SD cards driven by regulators.
This makes the mmc_spi driver work also with the Motorola A910 phone.
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
---
Changes since v1:
- Remove the ifdef CONFIG_REGULATOR as regulator_get() degenerates to
a stub as well when the regulator framework is disabled.
- Release the regulator in mmc_spi_remove()
Thanks,
Antonio
drivers/mmc/host/mmc_spi.c | 63 +++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 0f3672d..62b3b02 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -31,6 +31,7 @@
#include <linux/dma-mapping.h>
#include <linux/crc7.h>
#include <linux/crc-itu-t.h>
+#include <linux/regulator/consumer.h>
#include <linux/scatterlist.h>
#include <linux/mmc/host.h>
@@ -150,11 +151,13 @@ struct mmc_spi_host {
*/
void *ones;
dma_addr_t ones_dma;
+
+ struct regulator *vcc;
};
static inline int mmc_spi_canpower(struct mmc_spi_host *host)
{
- return host->pdata && host->pdata->setpower;
+ return (host->pdata && host->pdata->setpower) || host->vcc;
}
/****************************************************************************/
@@ -1225,17 +1228,35 @@ static inline int mmc_spi_setpower(struct mmc_spi_host *host,
unsigned char power_mode,
unsigned int vdd)
{
+ if (!mmc_spi_canpower(host))
+ return -ENOSYS;
+
/* switch power on/off if possible, accounting for
* max 250msec powerup time if needed.
*/
- if (mmc_spi_canpower(host)) {
- switch (power_mode) {
- case MMC_POWER_OFF:
- case MMC_POWER_UP:
+ switch (power_mode) {
+ case MMC_POWER_OFF:
+ if (host->vcc) {
+ int ret = mmc_regulator_set_ocr(host->mmc,
+ host->vcc, 0);
+ if (ret)
+ return ret;
+ } else {
+ host->pdata->setpower(&host->spi->dev, vdd);
+ }
+ break;
+
+ case MMC_POWER_UP:
+ if (host->vcc) {
+ int ret = mmc_regulator_set_ocr(host->mmc,
+ host->vcc, vdd);
+ if (ret)
+ return ret;
+ } else {
host->pdata->setpower(&host->spi->dev, vdd);
- if (power_mode == MMC_POWER_UP)
- msleep(host->powerup_msecs);
}
+ msleep(host->powerup_msecs);
+ break;
}
return 0;
@@ -1420,12 +1441,27 @@ static int mmc_spi_probe(struct spi_device *spi)
* and power switching gpios.
*/
host->pdata = mmc_spi_get_pdata(spi);
- if (host->pdata)
- mmc->ocr_avail = host->pdata->ocr_mask;
- if (!mmc->ocr_avail) {
- dev_warn(&spi->dev, "ASSUMING 3.2-3.4 V slot power\n");
- mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
+
+ host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc");
+ if (IS_ERR(host->vcc)) {
+ host->vcc = NULL;
+ } else {
+ host->mmc->ocr_avail = mmc_regulator_get_ocrmask(host->vcc);
+ if (host->pdata && host->pdata->ocr_mask)
+ dev_warn(mmc_dev(host->mmc),
+ "ocr_mask/setpower will not be used\n");
}
+
+ if (host->vcc == NULL) {
+ /* fall-back to platform data */
+ if (host->pdata)
+ mmc->ocr_avail = host->pdata->ocr_mask;
+ if (!mmc->ocr_avail) {
+ dev_warn(&spi->dev, "ASSUMING 3.2-3.4 V slot power\n");
+ mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+ }
+ }
+
if (mmc_spi_canpower(host)) {
host->powerup_msecs = host->pdata->powerup_msecs;
if (!host->powerup_msecs || host->powerup_msecs > 250)
@@ -1523,6 +1559,9 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
if (host->pdata && host->pdata->exit)
host->pdata->exit(&spi->dev, mmc);
+ if (host->vcc)
+ regulator_put(host->vcc);
+
mmc_remove_host(mmc);
if (host->dma_dev) {
--
1.7.4.4
next prev parent reply other threads:[~2011-04-22 12:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1300733202-27316-1-git-send-email-ospite@studenti.unina.it>
2011-04-21 12:27 ` [RESEND PATCH 0/4] mmc_spi: Add support for regulator framework Antonio Ospite
2011-04-21 12:27 ` [RESEND PATCH 1/4] mmc_spi.c: factor out the check for power capability Antonio Ospite
2011-04-21 12:27 ` [RESEND PATCH 2/4] mmc_spi.c: factor out the SD card shutdown sequence Antonio Ospite
2011-04-21 12:27 ` [RESEND PATCH 3/4] mmc_spi.c: factor out a mmc_spi_setpower() function Antonio Ospite
2011-04-21 12:27 ` [RESEND PATCH 4/4] mmc_spi.c: add support for the regulator framework Antonio Ospite
2011-04-21 12:40 ` Mark Brown
2011-04-21 12:49 ` Antonio Ospite
2011-04-26 21:21 ` Daniel Ribeiro
2011-04-22 12:43 ` Antonio Ospite [this message]
2011-05-06 14:30 ` [PATCH v2 " Antonio Ospite
2011-05-11 10:39 ` [PATCH v3] " Antonio Ospite
[not found] ` <1305110379-17218-1-git-send-email-ospite-aNJ+ML1ZbiP93QAQaVx+gl6hYfS7NtTn@public.gmane.org>
2011-05-11 13:08 ` Mark Brown
2011-05-11 20:53 ` Antonio Ospite
2011-05-11 20:57 ` Mark Brown
2011-05-18 17:23 ` Antonio Ospite
2011-05-18 19:42 ` Mark Brown
2011-05-23 15:10 ` Antonio Ospite
2011-05-30 9:07 ` Antonio Ospite
2011-05-30 10:14 ` Mark Brown
2011-05-30 10:57 ` Antonio Ospite
2011-05-31 10:05 ` 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=1303476191-20663-1-git-send-email-ospite@studenti.unina.it \
--to=ospite@studenti.unina.it \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cjb@laptop.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-mmc@vger.kernel.org \
--cc=openezx-devel@lists.openezx.org \
--cc=spi-devel-general@lists.sourceforge.net \
/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).