From: Antonio Ospite <ospite@studenti.unina.it>
To: linux-mmc@vger.kernel.org
Cc: Antonio Ospite <ospite@studenti.unina.it>,
Daniel Ribeiro <drwyrm@gmail.com>,
David Brownell <dbrownell@users.sourceforge.net>,
Chris Ball <cjb@laptop.org>,
Grant Likely <grant.likely@secretlab.ca>,
Ernst Schwab <eschwab@online.de>,
Sonic Zhang <sonic.zhang@analog.com>,
Linus Walleij <linus.walleij@stericsson.com>,
openezx-devel@lists.openezx.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] mmc_spi.c: add support for the regulator framework
Date: Mon, 21 Mar 2011 19:46:42 +0100 [thread overview]
Message-ID: <1300733202-27316-5-git-send-email-ospite@studenti.unina.it> (raw)
In-Reply-To: <1300733202-27316-1-git-send-email-ospite@studenti.unina.it>
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>
---
drivers/mmc/host/mmc_spi.c | 61 +++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 5e4b2c7..d5fe841 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,28 @@ 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;
+#ifdef CONFIG_REGULATOR
+ 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");
}
+#endif
+ 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)
--
1.7.4.1
next prev parent reply other threads:[~2011-03-21 18:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 18:46 [PATCH 0/4] mmc_spi: Add support for regulator framework Antonio Ospite
2011-03-21 18:46 ` [PATCH 1/4] mmc_spi.c: factor out the check for power capability Antonio Ospite
2011-03-21 18:46 ` [PATCH 2/4] mmc_spi.c: factor out the SD card shutdown sequence Antonio Ospite
2011-03-21 18:46 ` [PATCH 3/4] mmc_spi.c: factor out a mmc_spi_setpower() function Antonio Ospite
2011-03-21 18:46 ` Antonio Ospite [this message]
2011-04-04 9:56 ` [PATCH 0/4] mmc_spi: Add support for regulator framework Antonio Ospite
2011-04-05 3:05 ` Grant Likely
2011-04-05 8:43 ` Antonio Ospite
2011-04-05 13:46 ` Grant Likely
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=1300733202-27316-5-git-send-email-ospite@studenti.unina.it \
--to=ospite@studenti.unina.it \
--cc=cjb@laptop.org \
--cc=dbrownell@users.sourceforge.net \
--cc=drwyrm@gmail.com \
--cc=eschwab@online.de \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=openezx-devel@lists.openezx.org \
--cc=sonic.zhang@analog.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;
as well as URLs for NNTP newsgroup(s).